diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
| commit | a615d19df88eb2e989316b480519161945dbc7dc (patch) | |
| tree | 369970b98042998b86c11024598155e037b76fec | |
| parent | 76a93e0011ade1583a1ec672f33411dfd35454f3 (diff) | |
| download | tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip | |
RPM: merge redhat directory with master branch
563 files changed, 29777 insertions, 16401 deletions
diff --git a/redhat/.gitignore b/redhat/.gitignore index e69de29bb..af26df847 100644 --- a/redhat/.gitignore +++ b/redhat/.gitignore @@ -0,0 +1 @@ +*/*/patches diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index cf00b4eb3..c248b34e5 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -1,7 +1,8 @@ SHELL := /bin/bash PACKAGING_DIR := $(shell cd ..; pwd) PATH := $(PATH):$(shell pwd)/build -TDE_VERSION = 14.0.0 +TDE_VERSION := 14.0.5 +DIST := $(shell rpm -E %dist) buildpkg = \ @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \ @@ -21,19 +22,22 @@ buildpkg = \ all: dependencies main libraries applications i18n meta extras -dependencies: tqt3 tqtinterface arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode +dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev -libraries: libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity -applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake +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 tde-guidance tdeio-apt tdeio-ftps 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 i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n -extras: icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora +extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb ### Trinity Dependencies +akode: tqtinterface trinity-filesystem + $(call buildpkg,dependencies/akode) + arts: tqtinterface trinity-filesystem esound cmake $(call buildpkg,dependencies/arts) -avahi-tqt: tqtinterface autoconf automake libtool +avahi-tqt: tqtinterface autoconf automake libtool2 $(call buildpkg,dependencies/avahi-tqt) dbus-1-tqt: tqtinterface cmake @@ -42,7 +46,7 @@ dbus-1-tqt: tqtinterface cmake dbus-tqt: tqtinterface cmake $(call buildpkg,dependencies/dbus-tqt) -libart_lgpl: tqtinterface libtool +libart_lgpl: tqtinterface libtool2 $(call buildpkg,dependencies/libart-lgpl) libcaldav: tqtinterface autoconf libcurl @@ -50,7 +54,10 @@ libcaldav: tqtinterface autoconf libcurl libcarddav: tqtinterface autoconf libcurl $(call buildpkg,dependencies/libcarddav) - + +libr: + $(call buildpkg,dependencies/libr) + python-tqt: sip4-tqt tdelibs $(call buildpkg,dependencies/python-tqt) @@ -85,7 +92,7 @@ tdeadmin: tdebase tdeartwork: tdebase $(call buildpkg,main/tdeartwork) -tdebase: tdelibs cmake htdig fileshareset libconfig +tdebase: tdelibs cmake htdig fileshareset $(call buildpkg,main/tdebase) tdebindings: tdebase tqscintilla @@ -97,19 +104,20 @@ tdeedu: tdebase tdegames: tdebase tdemultimedia $(call buildpkg,main/tdegames) -tdegraphics: tdebase poppler cmake +tdegraphics: tdebase poppler cmake lcms $(call buildpkg,main/tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl +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 || : $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode $(call buildpkg,main/tdemultimedia) -tdenetwork: tdebase +tdenetwork: tdebase rdesktop $(call buildpkg,main/tdenetwork) -tdepim: tdebase libcaldav libcarddav cmake +tdepim: tdebase libcaldav libcarddav cmake dirmngr $(call buildpkg,main/tdepim) tdesdk: tdebase tdebindings cmake @@ -121,7 +129,7 @@ tdetoys: tdebase tdeutils: tdebase $(call buildpkg,main/tdeutils) -tdevelop: tdebase tdesdk cmake +tdevelop: tdebase tdesdk cmake tar $(call buildpkg,main/tdevelop) tdewebdev: tdebase tdesdk @@ -130,31 +138,61 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools autoconf: m4 # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,3rdparty/autoconf) endif automake: # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/automake) endif cmake: -# Build on CentOS 5/6 only -ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +# 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) +endif + esound: -# Build on Mageia and CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) +# Build on Mageia, Fedora >= 23, Opensuse >= 15.0 +ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .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, CentOS 7 -ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/gnuchess) endif @@ -165,102 +203,129 @@ ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) endif imlib1: -# Do NOT build on Fedora, nor CentOS +# Do NOT build on Fedora, nor CentOS, nor PCLOS ifeq ($(wildcard /etc/fedora-release),) -ifeq ($(wildcard /etc/centos-release),) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5 .el6 .el7)) $(call buildpkg,3rdparty/imlib1) endif endif -endif -libconfig: -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/libconfig) +lcms: +# Build on EL7, OSS150, OSSTW +ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) + $(call buildpkg,3rdparty/lcms) endif - -libcurl: automake libtool +libcurl: automake libtool2 # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el4)) $(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 +libtool2: autoconf automake # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/libtool) +ifneq (,$(filter $(DIST),.el5)) + $(call buildpkg,3rdparty/libtool2) endif lilypond: mftrace # Build on CentOS 6 only -ifneq ($(wildcard /boot/vmlinuz*.el6*),) +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,3rdparty/lilypond) endif m4: -# Build on CentOS 5 only (vendor-provided m4 is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +# 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 ($(wildcard /boot/vmlinuz*.el6*),) +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,3rdparty/mftrace) endif +mp4v2: +# Build on OpenSUSE only +ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw)) + $(call buildpkg,3rdparty/mp4v2) +endif + pcsc-perl: -# Build on CentOS -ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) +# 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 ($(wildcard /boot/vmlinuz*.el5*),) +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)) + $(call buildpkg,3rdparty/rdesktop) +endif + +rdiff-backup: +# Only for PCLINUXOS +ifneq ($(wildcard /etc/pclinuxos-release),) + $(call buildpkg,3rdparty/rdiff-backup) +endif + +recode: +# Build on OpenSUSE >= 15.0 only +ifneq (,$(filter $(DIST),.oss150 .osstw)) + $(call buildpkg,3rdparty/recode) +endif + sip: # Build on CentOS 5 only (vendor-provided SIP is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +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 ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) $(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 +kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi $(call buildpkg,libraries/kipi-plugins) -libkdcraw: tqtinterface +libkdcraw: tqtinterface lcms $(call buildpkg,libraries/libkdcraw) libkexiv2: tqtinterface @@ -269,7 +334,7 @@ libkexiv2: tqtinterface libkipi: tqtinterface $(call buildpkg,libraries/libkipi) -libksquirrel: tqtinterface +libksquirrel: tdelibs $(call buildpkg,libraries/libksquirrel) libtdeldap: tqtinterface @@ -294,13 +359,13 @@ abakus: tdebase adept: tdebase $(call buildpkg,applications/adept) -amarok: tdebase cmake +amarok: tdebase cmake mp4v2 $(call buildpkg,applications/amarok) -basket: tdebase +basket: tdebase tdepim $(call buildpkg,applications/basket) -bibletime: tdebase +bibletime: tdebase sword $(call buildpkg,applications/bibletime) compizconfig-backend-kconfig: tdebase @@ -326,13 +391,13 @@ fusion-icon: tdebase gtk3-tqt-engine: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +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 ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/gtk-qt-engine) endif @@ -340,10 +405,16 @@ 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) @@ -379,13 +450,22 @@ 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) @@ -405,15 +485,21 @@ kdirstat: tdebase kdpkg: tdebase $(call buildpkg,applications/kdpkg) -keep: tdebase +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 kerry: tdebase $(call buildpkg,applications/kerry) +keximdb: tdebase koffice + $(call buildpkg,applications/keximdb) + kftpgrabber: tdebase $(call buildpkg,applications/kftpgrabber) @@ -430,7 +516,10 @@ 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) @@ -447,7 +536,7 @@ kmplayer: tdebase kmyfirewall: tdebase $(call buildpkg,applications/kmyfirewall) -kmymoney: tdebase +kmymoney: tdebase recode $(call buildpkg,applications/kmymoney) knemo: tdebase @@ -460,7 +549,10 @@ knetstats: tdebase $(call buildpkg,applications/knetstats) knetworkmanager8: tdebase +# RHEL6 only +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,applications/knetworkmanager8) +endif knights: tdebase gnuchess $(call buildpkg,applications/knights) @@ -474,24 +566,32 @@ knowit: tdebase knutclient: tdebase $(call buildpkg,applications/knutclient) -koffice: tdebase wv2 +koffice: tdebase tdegraphics wv2 $(call buildpkg,applications/koffice) konversation: tdebase $(call buildpkg,applications/konversation) -kopete-otr: tdebase libotr3 +kooldock: tdebase + $(call buildpkg,applications/kooldock) + +kopete-otr: tdebase tdenetwork +ifeq (,$(filter $(DIST),.pclos2018)) $(call buildpkg,applications/kopete-otr) +endif 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*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kpilot) endif +kplayer: tdebase + $(call buildpkg,applications/kplayer) + kpowersave: tdebase $(call buildpkg,applications/kpowersave) @@ -501,10 +601,10 @@ krecipes: tdebase krename: tdebase $(call buildpkg,applications/krename) -krusader: tdebase +krusader: tdebase tdebindings $(call buildpkg,applications/krusader) -kscope: tdebase +kscope: tdebase cscope $(call buildpkg,applications/kscope) ksensors: tdebase @@ -519,7 +619,7 @@ kshutdown: tdebase ksplash-engine-moodin: tdebase $(call buildpkg,applications/ksplash-engine-moodin) -ksquirrel: tdebase libksquirrel +ksquirrel: tdebase libkipi libksquirrel $(call buildpkg,applications/ksquirrel) kstreamripper: tdebase @@ -546,6 +646,9 @@ kvkbd: tdebase kvpnc: tdebase $(call buildpkg,applications/kvpnc) +kxmleditor: tdebase + $(call buildpkg,applications/kxmleditor) + mplayerthumbs: tdebase $(call buildpkg,applications/mplayerthumbs) @@ -555,15 +658,21 @@ piklab: tdebase potracegui: tdebase $(call buildpkg,applications/potracegui) +qalculate-tde: tdebase +# Do NOT build on CentOS 5, CentOS 6 +ifeq (,$(filter $(DIST),.el5 .el6)) + $(call buildpkg,applications/qalculate-tde) +endif + qt4-tqt-theme-engine: tdebase -# Do NOT build on CentOS -ifeq ($(wildcard /etc/centos-release),) +# Do NOT build on CentOS 5, CentOS 6 +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/qt4-tqt-theme-engine) endif rosegarden: tdebase lilypond # Do NOT build on CentOS 5, CentOS 7 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) +ifeq (,$(filter $(DIST),.el5 .el7)) $(call buildpkg,applications/rosegarden) endif @@ -576,6 +685,9 @@ smb4k: tdebase soundkonverter: tdebase $(call buildpkg,applications/soundkonverter) +tastymenu: tdebase pytdeextensions + $(call buildpkg,applications/tastymenu) + tde-guidance: tdebase pytdeextensions $(call buildpkg,applications/tde-guidance) @@ -588,7 +700,7 @@ tdeio-ftps: tdebase tdeio-locate: tdebase $(call buildpkg,applications/tdeio-locate) -tdeio-sword: tdebase +tdeio-sword: tdebase sword $(call buildpkg,applications/tdeio-sword) tdeio-umountwrapper: tdebase @@ -596,16 +708,28 @@ tdeio-umountwrapper: tdebase tdenetworkmanager: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/tdenetworkmanager) endif tdepowersave: tdebase +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tdepowersave) +endif tderadio: tdebase $(call buildpkg,applications/tderadio) +tde-style-baghira: + $(call buildpkg,applications/tde-style-baghira) + +tde-style-domino: + $(call buildpkg,applications/tde-style-domino) + +tde-style-ia-ora: + $(call buildpkg,applications/tde-style-ia-ora) + tde-style-lipstik: tdebase $(call buildpkg,applications/tde-style-lipstik) @@ -624,8 +748,11 @@ tde-systemsettings: tdebase tdmtheme: tdebase $(call buildpkg,applications/tdmtheme) -tellico: tdebase +tellico: tdebase tdemultimedia +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tellico) +endif tork: tdebase torsocks $(call buildpkg,applications/tork) @@ -644,7 +771,10 @@ 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) @@ -661,14 +791,28 @@ celestia: $(call buildpkg,extras/celestia) fileshareset: +ifeq ($(wildcard /boot/vmlinuz*.mga6*),) $(call buildpkg,extras/fileshareset) +endif hk_classes: +# Not on Fedora 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) $(call buildpkg,extras/hk_classes) +endif + +icons-crystalsvg-updated: + $(call buildpkg,extras/icons-crystalsvg-updated) + +icons-kfaenza: + $(call buildpkg,extras/icons-kfaenza) icons-nuvola: $(call buildpkg,extras/icons-nuvola) +icons-oxygen: + $(call buildpkg,extras/icons-oxygen) + kdevmon: $(call buildpkg,extras/kdevmon) @@ -676,13 +820,22 @@ kdissert: $(call buildpkg,extras/kdissert) klamav: +# Not on Fedora >= 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) $(call buildpkg,extras/klamav) +endif klibido: pan +# Not on RHEL5, nor recent OpenSUSE +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) $(call buildpkg,extras/klibido) +endif knoda: hk_classes +# Not on Fedora 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) $(call buildpkg,extras/knoda) +endif kompose: $(call buildpkg,extras/kompose) @@ -696,8 +849,10 @@ kpacman: mathemagics: $(call buildpkg,extras/mathemagics) -pan: +pan: gmime intltool +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) $(call buildpkg,3rdparty/pan) +endif png2qrgb: $(call buildpkg,extras/png2qrgb) @@ -705,9 +860,6 @@ png2qrgb: scribus: $(call buildpkg,extras/scribus) -style-ia-ora: - $(call buildpkg,extras/style-ia-ora) - trinity-filesystem: $(call buildpkg,extras/trinity-filesystem) diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec index e8a003bc8..0208dd0fa 100644 --- a/redhat/applications/abakus/abakus-14.0.0.spec +++ b/redhat/applications/abakus/abakus-14.0.0.spec @@ -1,52 +1,87 @@ -# Default version for this component -%define tde_pkg abakus +# +# spec file for package abakus (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg abakus +%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/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: Calculator for TDE -Version: 0.91 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.91 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Calculator for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.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: desktop-file-utils BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + BuildRequires: bison +BuildRequires: flex + +# ACL support +BuildRequires: libacl-devel + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + %description AbaKus is a complex calculator, which provides @@ -56,7 +91,7 @@ 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -107,15 +142,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -125,6 +151,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdedocdir}/HTML/en/abakus/ %{tde_datadir}/applnk/Utilities/abakus.desktop + %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec index 3536b5ad4..9200c19a4 100644 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ b/redhat/applications/abakus/abakus-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg abakus %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -25,7 +20,7 @@ Name: trinity-%{tde_pkg} Summary: Calculator for TDE Version: 0.91 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -129,11 +124,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/applnk/Utilities/abakus.desktop %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.91-5 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-4 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index 2ba208ff8..62e996ddf 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -1,10 +1,24 @@ +# +# spec file for package adept (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/ +# + # Default version for this component %define tde_pkg adept +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif # TDE specific building variables @@ -27,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Package management suite for Trinity Version: 2.1.3 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -41,7 +55,6 @@ 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-util @@ -151,7 +164,7 @@ by external applications. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -193,9 +206,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.1.3-2 -- Initial release for TDE 14.0.0 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.1.3-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec index ef01e0480..0939d80f0 100644 --- a/redhat/applications/adept/adept-3.5.13.2.spec +++ b/redhat/applications/adept/adept-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg adept %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Package management suite for Trinity Version: 2.1.3 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -149,7 +144,7 @@ by external applications. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -186,6 +181,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.1.3-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec index 3d74ac57a..a18b8f583 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok-14.0.0.spec @@ -1,58 +1,97 @@ -# Basic package informations -%define tde_pkg amarok +# +# spec file for package amarok (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg amarok +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man - %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.4.10 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Media player for TDE +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ +#Url: http://amarok.kde.org -Name: trinity-%{tde_pkg} -Summary: Media player -Version: 1.4.10 -Release: %{?!preversion:13}%{?preversion:12_%{preversion}}%{?dist}%{?_variant} +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Group: Applications/Multimedia -License: GPLv2+ -Url: http://amarok.kde.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: trinity-konqueror-devel >= %{tde_version} + +BuildRequires: trinity-filesystem >= %{tde_version} +Requires: trinity-filesystem >= %{tde_version} + BuildRequires: desktop-file-utils +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: gettext -BuildRequires: trinity-konqueror-devel >= %{tde_version} +# ACL support +BuildRequires: libacl-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 +# ALSA support BuildRequires: alsa-lib-devel -BuildRequires: desktop-file-utils + +# ESOUND support BuildRequires: esound-devel -BuildRequires: gettext + +# PCRE support BuildRequires: pcre-devel -BuildRequires: taglib-devel # LIBTOOL BuildRequires: libtool @@ -66,9 +105,19 @@ BuildRequires: postgresql-devel BuildRequires: SDL-devel BuildRequires: taglib-devel BuildRequires: sqlite-devel + # not used anymore, in favor of libvisual ? -- Rex #{?fedora:BuildRequires: xmms-devel} +# 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 # DBUS support %if 0%{?suse_version} @@ -112,7 +161,6 @@ BuildRequires: libgpod-devel >= 0.4.2 %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 @@ -127,11 +175,26 @@ BuildRequires: libnjb-devel BuildRequires: libvisual-devel %endif +# MUSICBRAINZ support +%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} >= 24 +BuildRequires: libmusicbrainz5-devel +%else +BuildRequires: libmusicbrainz-devel +%endif +%endif + # TUNEPIMP support +%if 0%{?pclinuxos} +BuildRequires: libofa-devel +%endif %if 0%{?mgaversion} && 0%{?mgaversion} <= 2 BuildRequires: libtunepimp-devel %endif -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500 +BuildRequires: libtunepimp-devel +%endif +%if 0%{?fedora} && 0%{?fedora} <= 23 BuildRequires: libtunepimp-devel %endif @@ -144,15 +207,11 @@ BuildRequires: %{_lib}inotifytools-devel %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5 %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 @@ -181,6 +240,9 @@ BuildRequires: libmp4v2-devel # ruby BuildRequires: ruby BuildRequires: ruby-devel +%if 0%{?fedora} >= 19 +BuildRequires: rubypick +%endif # To open the selected browser, works with Patch2 Requires: xdg-utils @@ -223,7 +285,7 @@ Amarok is a multimedia player with: %{tde_tdeappdir}/*.desktop %{tde_datadir}/servicetypes/*.desktop %{tde_datadir}/apps/profiles/amarok.profile.xml -%{tde_datadir}/config/amarokrc +%{tde_confdir}/amarokrc %{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/services/amarokitpc.protocol %{tde_datadir}/services/amaroklastfm.protocol @@ -294,23 +356,12 @@ Amarok is a multimedia player with: %{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} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} # For dir ownership and some default plugins (lyrics) Requires: ruby @@ -319,7 +370,7 @@ Requires: ruby %files ruby %defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/* +%{tde_libdir}/ruby_lib/ ########## @@ -327,7 +378,7 @@ Requires: ruby Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-konqueror %description konqueror @@ -347,7 +398,7 @@ Requires: trinity-konqueror %package visualisation Summary: Visualisation plugins for Amarok Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} # No plugins by default, we need libvisual-plugins #Requires: libvisual-plugins @@ -364,7 +415,7 @@ use any of xmms' visualisation plugins with Amarok. ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -372,9 +423,14 @@ use any of xmms' visualisation plugins with Amarok. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch3 -p1 -b .rhel4 -%endif + +# Fix some Ruby stuff +if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" &>/dev/null; then + %__sed -i "amarok/src/mediadevice/daap/ConfigureChecks.cmake" \ + -e "s|Config::|RbConfig::|g" \ + -e "s|Config\.|RbConfig\.|g" +fi + %build unset QTDIR QTINC QTLIB @@ -398,10 +454,12 @@ fi -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=OFF \ \ -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} \ @@ -454,5 +512,3 @@ done %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-13 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec index 58764c6de..9f6c153db 100644 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ b/redhat/applications/amarok/amarok-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg amarok %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Media player Version: 1.4.10 -Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -441,17 +436,3 @@ done %changelog -* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-12 -- Mageia 3: rebuild against Xine 1.2 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-9 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-8 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index 83e6196fe..66138fcdb 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -1,54 +1,85 @@ -# Default version for this component -%define tde_pkg basket +# +# spec file for package basket (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg basket +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man - %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Taking care of your ideas. -Version: 1.0.3.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.3.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Taking care of your ideas +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: desktop-file-utils BuildRequires: gpgme-devel +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + %description 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, @@ -58,23 +89,26 @@ images...) or notes, as well as to free your clutered desktop (if any). It is al 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 \ @@ -103,26 +137,17 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility +%endif -%clean -%__rm -rf %{buildroot} - +# Apps that should stay in TDE +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -131,6 +156,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_bindir}/basket %{tde_tdeappdir}/basket.desktop %{tde_datadir}/apps/basket/ +%dir %{tde_datadir}/apps/kontact/ksettingsdialog %{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg %{tde_libdir}/libbasketcommon.la %{tde_libdir}/libbasketcommon.so @@ -142,7 +168,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_tdelibdir}/libbasketpart.so %{tde_tdelibdir}/libkontact_basket.la %{tde_tdelibdir}/libkontact_basket.so -%{tde_datadir}/config/magic/basket.magic +%{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 @@ -158,8 +184,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_datadir}/services/kontact/basket.desktop %{tde_datadir}/services/kontact/basket_v4.desktop %{tde_tdedocdir}/HTML/en/basket/ +%{tde_confdir}/magic/basket.magic.mgc %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec index a44ddd45f..c392dea83 100644 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ b/redhat/applications/basket/basket-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg basket %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Taking care of your ideas. Version: 1.0.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -68,7 +63,7 @@ baskets to HTML. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -160,14 +155,3 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-4 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index f55298ab2..c6a0991a1 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -1,55 +1,91 @@ -# Default version for this component -%define tde_pkg bibletime -%define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package bibletime (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/ +# + +# Required for PCLinuxOS: removes the ldflag '--no-undefined' +%if 0%{?pclinuxos} +%define _disable_ld_no_undefined 1 %endif -# TDE specific building variables +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg bibletime +%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/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 bible study tool for Trinity +Epoch: %{tde_epoch} Version: 1.6.6.0 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A bible study tool for Trinity Group: Applications/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> -URL: http://www.trinitydesktop.org +#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-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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool +BuildRequires: desktop-file-utils BuildRequires: gettext +# 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 + +# BOOST support +BuildRequires: boost-devel + # Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 BuildRequires: clucene-core-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} @@ -67,17 +103,19 @@ 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -118,22 +156,13 @@ export PATH="%{tde_bindir}:${PATH}" %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop" + %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 @@ -145,5 +174,3 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec index 9a1a1f366..8bec59af8 100644 --- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec +++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg bibletime %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: A bible study tool for Trinity Version: 1.6.6.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -77,7 +72,7 @@ texts, write own notes, save, print etc.). %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -149,21 +144,3 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null %changelog -* Sun Sep 21 2014 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-7 -- Fix build with Sword 1.7 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2 -- Fix compilation on RHEL 5 -- Fix compilation with GCC 4.7 - -* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 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 index c21e3fa98..85a90a849 100644 --- 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 @@ -7,7 +7,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" -%define _variant .opt %define _docdir %{tde_prefix}/share/doc %endif @@ -19,7 +18,7 @@ BuildRequires: autoconf automake libtool m4 Name: trinity-%{?kdecomp} Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Release: %{?release}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> Summary: kconfig backend for compizconfig @@ -53,7 +52,7 @@ This package contains the kconfig backend for libcompizconfig %setup -q -n applications/%{kdecomp} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -85,6 +84,3 @@ export PATH="%{tde_bindir}:${PATH}" %exclude %{_usr}/%{_lib}/compizconfig/backends/*.la %changelog -* Tue Sep 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 -- Initial package -- Import to GIT diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec index 1dbd78139..dc95cb8c7 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam-14.0.0.spec @@ -1,50 +1,62 @@ -# Default version for this component -%define tde_pkg digikam +# +# spec file for package digikam (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg digikam +%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/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: digital photo management application for TDE [Trinity] +Epoch: %{tde_epoch} Version: 0.9.6 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Digital photo management application for TDE Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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 +Source1: digikam-open_in_digikam.desktop -# [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 @@ -53,9 +65,31 @@ BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + BuildRequires: libtiff-devel BuildRequires: gettext +# 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 + +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + # GPHOTO2 support %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: gphoto2-devel @@ -81,6 +115,13 @@ BuildRequires: libexiv2-devel BuildRequires: exiv2-devel %endif +# SQLITE support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif + Requires: trinity-libkexiv2 Requires: trinity-libkdcraw Requires: trinity-libkipi @@ -184,6 +225,7 @@ digiKam is based in part on the work of the Independent JPEG Group. %{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/konqueror/servicemenus/digikam-open_in_digikam.desktop %{tde_datadir}/apps/showfoto/ %{tde_datadir}/icons/hicolor/*/apps/digikam.png %{tde_datadir}/icons/hicolor/*/apps/showfoto.png @@ -221,28 +263,15 @@ digiKam is based in part on the work of the Independent JPEG Group. %{tde_datadir}/services/digikamthumbnail.protocol %{tde_datadir}/servicetypes/digikamimageplugin.desktop %{tde_mandir}/man*/* -#%{tde_tdedocdir}/HTML/en/digikam-apidocs/ %{tde_tdedocdir}/HTML/en/digikam/ %{tde_tdedocdir}/HTML/en/showfoto/ -%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 || : - ########## %package devel Group: Development/Libraries Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{summary} @@ -254,18 +283,12 @@ Requires: %{name} = %{version}-%{release} %{tde_libdir}/libdigikam.so %{tde_libdir}/libdigikam.la -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %package i18n Summary: Translation files for %{tde_pkg} Group: Applications/Utilities -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description i18n %{summary} @@ -285,15 +308,15 @@ Requires: %{name} = %{version}-%{release} %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/ %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/ %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/ -#%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/ +#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/ %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/ -#%lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/ +#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/ %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/ %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/ ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -301,12 +324,9 @@ Requires: %{name} = %{version}-%{release} %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -329,7 +349,9 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --without-included-sqlite3 %__make %{?_smp_mflags} || %__make @@ -341,11 +363,22 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Hide 'showfoto'. +echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop" + +# Install the 'open in digikam' action for konqueror. +install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file digikam Graphics Photography +%suse_update_desktop_file showfoto Graphics Viewer +%suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop" +%endif + %clean %__rm -rf %{buildroot} %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec index ff084696c..46bb635af 100644 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ b/redhat/applications/digikam/digikam-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg digikam %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: digital photo management application for TDE [Trinity] Version: 0.9.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -127,7 +122,7 @@ Requires: %{name} = %{version}-%{release} %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -314,40 +309,3 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4 -- Initial release for TDE 3.5.13.1 - -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3 -- Add support for Mageia 2 and Mandriva 2011 -- Removes old patches, adds GIT patches. -- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5] -- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f] -- Remove version.h. Cruft from an older version prior to 0.9.6. -- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7] -- GCC 4.7 fix. [Bug #958] [Commit #a9489034] -- GCC 4.7 fix. [Bug #958] [Commit #a209c81b] -- Fix 'format not a string literal' error [Commit #029218cd] -- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853] -- Fix FTBFS on png >= 0.15 [Commit #18ecd512] - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3 -- Fix man directory location -- Fix postinstall -- Fix description -- Add "BuildRequires: exiv2-devel" - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2 -- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] - -* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/digikam/digikam-open_in_digikam.desktop new file mode 100644 index 000000000..ddf7f93b4 --- /dev/null +++ b/redhat/applications/digikam/digikam-open_in_digikam.desktop @@ -0,0 +1,8 @@ +[Desktop Action OpenDigikam] +Exec=digikam --download-from %u +Icon=digikam +Name=Open in Digikam + +[Desktop Entry] +Actions=OpenDigikam; +ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec index 44857d19d..5a05f8183 100644 --- a/redhat/applications/dolphin/dolphin-14.0.0.spec +++ b/redhat/applications/dolphin/dolphin-14.0.0.spec @@ -1,70 +1,101 @@ -# Default version for this component -%define tde_pkg dolphin +# +# spec file for package dolphin (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg dolphin +%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/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: File manager for TDE focusing on usability +Epoch: %{tde_epoch} Version: 0.9.2 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: File manager for TDE focusing on usability Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -109,9 +140,6 @@ export PATH="%{tde_bindir}:${PATH}" %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 \ @@ -125,11 +153,6 @@ if [ $1 -eq 0 ]; then %{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,-) @@ -139,8 +162,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/apps/d3lphin/ %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ +%dir %{tde_datadir}/locale/d3lphin/ +%dir %{tde_datadir}/locale/d3lphin/LC_MESSAGES %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-9 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec index 660674e4e..30db977f4 100644 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg dolphin %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: File manager for TDE focusing on usability Version: 0.9.2 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -64,7 +59,7 @@ interface for the task of file management. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -142,32 +137,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-8 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-7 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-6 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5 -- Add alternatives with 'kio-umountwrapper' - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-4 -- Rebuild for Fedora 17 -- Fix HTML installation directory - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-2 -- Import to GIT - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1 -- Correct macro to install under "/opt", if desired - -* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0 -- Initial release for RHEL 6.0 -- Based on FC7 'Dolphin 0.8.2-2" SPEC file. - diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 9040a00e9..5feb96b8f 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -4,11 +4,6 @@ %define debug_package %{nil} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{kdecomp} Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity] Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -75,7 +70,7 @@ See the 'filelight' package description for more information. -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -114,10 +109,4 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) -%Changelog -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Rebuilt for Fedora 17 -- Removes useless post and postun - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight-14.0.0.spec index 9c9e3da50..674b56560 100644 --- a/redhat/applications/filelight/filelight-14.0.0.spec +++ b/redhat/applications/filelight/filelight-14.0.0.spec @@ -1,51 +1,99 @@ -# Default version for this component -%define tde_pkg filelight +# +# spec file for package filelight (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg filelight +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man - %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Graphical disk usage display +Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical disk usage display Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + +# ACL support +BuildRequires: libacl-devel + +# ATTR support +BuildRequires: libattr-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 + Obsoletes: filelight-l10n < %{version}-%{release} Provides: filelight-l10n = %{version}-%{release} @@ -53,67 +101,66 @@ Provides: filelight-l10n = %{version}-%{release} Filelight creates a complex, but data-rich graphical representation of the files and directories on your computer. +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export 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} \ + +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}" \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -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} \ + \ + -DBUILD_ALL="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 -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file filelight FileManager +%endif -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -124,7 +171,7 @@ done %{tde_datadir}/apps/filelight/ %{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png %{tde_datadir}/icons/hicolor/*/apps/filelight.png -%{tde_datadir}/config/filelightrc +%{tde_confdir}/filelightrc %{tde_datadir}/services/*.desktop %{tde_tdelibdir}/libfilelight.so %{tde_tdelibdir}/libfilelight.la @@ -137,6 +184,5 @@ done %lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/ %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ + %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-9 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec index 154efd222..f1b71ae47 100644 --- a/redhat/applications/filelight/filelight-3.5.13.2.spec +++ b/redhat/applications/filelight/filelight-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg filelight %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Graphical disk usage display Version: 1.0 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -63,7 +58,7 @@ directories on your computer. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -137,32 +132,3 @@ done %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-8 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-5 -- Initial release for TDE 3.5.13.1 -- Obsoletes package 'filelight-l10n' - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec index afb74de02..8f2e0cd6d 100644 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec @@ -1,17 +1,14 @@ # 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 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -83,15 +80,6 @@ find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete %__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,-) %{tde_bindir}/fusion-icon @@ -101,9 +89,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg -%Changelog -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-2 -- Fix python module installation - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 729590bfe..99f8992ff 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -7,11 +7,6 @@ %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -31,7 +26,7 @@ Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -112,9 +107,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg -%Changelog -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-2 -- Fix python module installation - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index efe337232..ef32736f0 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -1,41 +1,57 @@ -# Default version for this component -%define tde_pkg gtk-qt-engine +# +# spec file for package gtk-qt-engine (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg gtk-qt-engine +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: theme engine using Qt for GTK+ 2.x and Trinity +Epoch: %{tde_epoch} Version: 0.8 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Theme engine using Qt for GTK+ 2.x and Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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) @@ -44,13 +60,41 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -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: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# GTK2 support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: gtk2-devel +%endif +%if 0%{?mgaversion} >= 5 +BuildRequires: %{_lib}gtk+2.0-devel +%endif +%if 0%{?mdkversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}gtk+2.0_0-devel +%else +BuildRequires: gtk+2.0-devel +%endif +%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 %description @@ -63,10 +107,14 @@ Please note that this package is targeted at Trinity users and therefore provide a way to configure it from within KControl. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -124,17 +172,22 @@ 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 %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory +%dir %{_libdir}/gtk-2.0 +%dir %{_libdir}/gtk-2.0/2.10.0 +%dir %{_libdir}/gtk-2.0/2.10.0/engines %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so +%dir %{_datadir}/themes +%dir %{_datadir}/themes/Qt +%dir %{_datadir}/themes/Qt/gtk-2.0 %{_datadir}/themes/Qt/gtk-2.0/gtkrc %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-7 -- Initial release for TDE 14.0.0 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 index cde2e6341..d6c1a5311 100644 --- 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 @@ -2,11 +2,6 @@ %define tde_pkg gtk-qt-engine %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -149,25 +144,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Mon Jan 06 2014 Francois Andriot <francois.andriot@free.fr> - 0.8-7 -- Backport fixes from R14 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4 -- Initial release for TDE 3.5.13.1 - -* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 -- Add missing gtkrc files - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2 -- Rebuilt for Fedora 17 -- Fix FTBFS with newer glib -- Removes useless post and postun - -* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec index 31fd2e98d..be57d2f0e 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec @@ -1,54 +1,82 @@ -# Default version for this component -%define tde_pkg gtk3-tqt-engine +# +# spec file for package gtk3-tqt-engine (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg gtk3-tqt-engine +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: GTK3 theme engine for TDE +Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: GTK3 theme engine for TDE Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: gtk3-devel %else @@ -58,11 +86,13 @@ BuildRequires: gtk+3.0-devel %description GTK3 style engine which uses the active TDE style to draw its widgets +########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -71,7 +101,7 @@ GTK3 style engine which uses the active TDE style to draw its widgets %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -79,6 +109,19 @@ GTK3 style engine which uses the active TDE style to draw its widgets unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +if [ -d "/usr/include/atk-1.0" ]; then + extra_includes="%{_includedir}/atk-1.0:${extra_includes}" +fi +if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then + extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}" +fi +if [ -d "/usr/include/gtk-3.0" ]; then + extra_includes="%{_includedir}/gtk-3.0:${extra_includes}" +fi +if [ -d "/usr/include/pango-1.0" ]; then + extra_includes="%{_includedir}/pango-1.0:${extra_includes}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -94,7 +137,9 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} %__make %{?_smp_mflags} @@ -120,9 +165,9 @@ export PATH="%{tde_bindir}:${PATH}" %{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so %{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0 %{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0 +%dir %{_datadir}/themes/tdegtk +%dir %{_datadir}/themes/tdegtk/gtk-3.0 %{_datadir}/themes/tdegtk/gtk-3.0/gtk.css %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec index 63662a81b..b5bee8041 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n-14.0.0.spec @@ -1,41 +1,57 @@ -# Default version for this component -%define tde_pkg gwenview-i18n +# +# spec file for package gwenview-i18n (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg gwenview-i18n +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Internationalization support for Gwenview [Trinity] +Epoch: %{tde_epoch} Version: 1.4.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Internationalization support for Gwenview [Trinity] Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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) @@ -44,27 +60,24 @@ 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 +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# SUSE desktop files utility %if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel +BuildRequires: update-desktop-files %endif -%if "%{?tde_prefix}" == "/usr" -Conflicts: kdegraphics +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity %endif @@ -82,23 +95,26 @@ converting, and batch processing, HTML gallery and others are provided by the KIPI image framework. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" ./configure \ --prefix=%{tde_prefix} \ @@ -137,22 +153,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -170,5 +170,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4 -- Initial release for TDE 14.0.0 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 index f9d93019b..f04999d0e 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg gwenview-i18n %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Internationalization support for Gwenview [Trinity] Version: 1.4.2 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -91,7 +86,7 @@ KIPI image framework. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -170,12 +165,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1 -- Initial release for TDE 3.5.13.1 - diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec index 773511b00..8f635bf08 100644 --- a/redhat/applications/gwenview/gwenview-14.0.0.spec +++ b/redhat/applications/gwenview/gwenview-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg gwenview +# +# spec file for package gwenview (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg gwenview +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Gwenview is an image viewer for TDE. +Epoch: %{tde_epoch} Version: 1.4.2 -Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Gwenview is an image viewer for TDE. Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +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 + # EXIV2 support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}exiv2-devel @@ -79,23 +106,26 @@ converting, and batch processing, HTML gallery and others are provided by the KIPI image framework. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -126,27 +156,16 @@ export PATH="%{tde_bindir}:${PATH}" # Removes useless files (-devel ?) %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file gwenview RasterGraphics Viewer +%endif + %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 @@ -164,7 +183,9 @@ done %{tde_tdelibdir}/libgvimagepart.so %{tde_tdeappdir}/gwenview.desktop %{tde_datadir}/apps/gwenview/ +%dir %{tde_datadir}/apps/gvdirpart %{tde_datadir}/apps/gvdirpart/gvdirpart.rc +%dir %{tde_datadir}/apps/gvimagepart %{tde_datadir}/apps/gvimagepart/gvimagepart.rc %{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc %{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.sh @@ -191,5 +212,3 @@ done %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-12 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec index 9889fe526..55105a6c9 100644 --- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec +++ b/redhat/applications/gwenview/gwenview-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg gwenview %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Gwenview is an image viewer for TDE. Version: 1.4.2 -Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -88,7 +83,7 @@ KIPI image framework. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -190,42 +185,3 @@ done %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-11 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-10 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9 -- Initial release for TDE 3.5.13.1 - -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8 -- Add support for Mageia 2 and Mandriva 2011 -- Define QT_CLEAN_NAMESPACE during libmng checks [Commit #59c7639f] - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-7 -- Rebuilt for Fedora 17 -- Fix post and postun -- Adds patches from GIT - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-6 -- Fix HTML directory location - -* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-5 -- Adds missing files - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-4 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-2 -- Add fix for Fedora 15 - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1 -- Correct macro to install under "/opt", if desired - -* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec index 908c9be85..c641a739f 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec @@ -1,38 +1,60 @@ -# Default version for this component -%define tde_pkg k3n-i18n +# +# spec file for package k3b-i18n (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg k3b-i18n +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-k3b-i18n -Summary: Internationalization support for TDE [Trinity] +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Internationalization support for TDE [Trinity] +Group: Applications/Archiving 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) + BuildArch: noarch # Speed build options @@ -40,22 +62,18 @@ BuildArch: noarch %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 +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + Requires(post): coreutils Requires(postun): coreutils @@ -328,39 +346,42 @@ This package contains the Ukrainian translations for K3B. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -./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} \ +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}" \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -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} \ + .. -%__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 %__rm -rf %{buildroot}%{tde_datadir}/locale/af %__rm -rf %{buildroot}%{tde_datadir}/locale/ar @@ -409,5 +430,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 -- Initial release for TDE 14.0.0 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 index 50ea062cd..13ce2e60f 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k3n-i18n %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-k3b-i18n Summary: Internationalization support for TDE [Trinity] Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -329,7 +324,7 @@ This package contains the Ukrainian translations for K3B. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -408,14 +403,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 -- Initial release for TDE 3.5.13.1 - -* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec index 8e2310afb..5bc2c6e88 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b-14.0.0.spec @@ -1,74 +1,116 @@ -# Default version for this component -%define tde_pkg k3b +# +# spec file for package k3b (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg k3b +%define tde_prefix /opt/trinity +%define tde_appdir %{tde_datadir}/applications %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: CD/DVD burning application -Epoch: 1 +Epoch: %{tde_epoch} Version: 1.0.5 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: CD/DVD burning application +Group: Applications/Archiving URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Group: Applications/Archiving -License: GPLv2+ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source2: k3brc +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Legacy RedHat / Fedora patches -# manual bufsize (upstream?) -Patch4: k3b-1.0.4-manualbufsize.patch +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc -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 +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 + BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: gettext BuildRequires: libmpcdec-devel -BuildRequires: libmusicbrainz-devel BuildRequires: libvorbis-devel BuildRequires: taglib-devel BuildRequires: zlib-devel +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + +# ACL support +BuildRequires: libacl-devel + +# ATTR support +BuildRequires: libattr-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 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 Requires: wodim REquires: genisoimage %else @@ -82,6 +124,17 @@ Requires: dvd+rw-tools Requires: cdrdao %endif +# UDEV support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +BuildRequires: libudev-devel +%endif + +# HAL support +%if 0%{?rhel} == 5 +%define with_hal 1 +BuildRequires: hal-devel +%endif + # DBUS support # TQT bindings not available for RHEL4 %if 0%{?rhel} == 4 @@ -106,14 +159,12 @@ 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} @@ -129,6 +180,7 @@ BuildRequires: flac-devel %endif # MAD support +%ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 %if 0%{?mdkversion} || 0%{?mgaversion} @@ -138,15 +190,21 @@ BuildRequires: %{_lib}mad-devel BuildRequires: libmad-devel %endif %endif +%endif # LAME support +%if 0%{?opensuse_bs} == 0 %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 +%if 0%{?mgaversion} >= 6 +BuildRequires: %{_lib}mp3lame-devel +%else +BuildRequires: %{_lib}lame-devel +%endif %endif %endif %if 0%{?suse_version} @@ -156,6 +214,7 @@ BuildRequires: libmp3lame-devel BuildRequires: lame-devel %endif %endif +%endif # FFMPEG support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} @@ -231,7 +290,6 @@ BuildArch: noarch %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 @@ -240,7 +298,6 @@ BuildArch: noarch %{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/tdefile_k3b.desktop @@ -250,20 +307,6 @@ BuildArch: noarch %{tde_datadir}/sounds/k3b_wait_media1.wav %{tde_tdedocdir}/HTML/en/tdeioslave/videodvd/ -%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 @@ -281,12 +324,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_libdir}/libk3bdevice.so.5 %{tde_libdir}/libk3bdevice.so.5.0.0 -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - ########## %package devel @@ -303,12 +340,6 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %{tde_libdir}/libk3b.so %{tde_libdir}/libk3bdevice.so -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - ########## %if 0%{?with_libmad} @@ -375,7 +406,7 @@ and a generic audio and video file converter. ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -385,74 +416,50 @@ and a generic audio and video file converter. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# set in k3brc too -%patch4 -p1 -b .manualbufsize - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export 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" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build 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} \ +%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}" \ + -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} \ + -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} \ \ - --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 \ - --without-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 + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_MUSICBRAINZ="OFF" \ + -DWITH_FFMPEG_ALL_CODECS="ON" \ + -DWITH_MUSEPACK="ON" \ + -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ + -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc +%__make install DESTDIR=%{?buildroot} -C build # remove the .la files %__rm -f %{buildroot}%{tde_libdir}/libk3b*.la @@ -463,5 +470,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-2 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec index 052511e2a..851cf978e 100644 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ b/redhat/applications/k3b/k3b-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k3b %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: CD/DVD burning application Epoch: 1 Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -397,7 +392,7 @@ and a generic audio and video file converter. %patch106 -p1 -b .desktopfile %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -471,38 +466,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - -* Sun Jan 06 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2 -- Enables FFMPEG support -- Enables LAME support -- Enables MAD support - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 -- Remove requirement for resmgr - -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Add support for Mageia 2 and Mandriva 2011 -- Fix DBUS-TQT detection that prevented HAL support -- Adds requirement for resmgr - -* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Removes i18 files (built separately) - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Rebuilt for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] - -* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Updates BuildRequires - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - -* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Import to GIT diff --git a/redhat/applications/k3b/trinity-k3b-rpmlintrc b/redhat/applications/k3b/trinity-k3b-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/k3b/trinity-k3b-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index 13f59ddd9..f03137ba4 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -1,61 +1,109 @@ -# Default version for this component -%define tde_pkg k9copy +# +# spec file for package k9copy (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg k9copy +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: DVD backup tool for Trinity +Epoch: %{tde_epoch} Version: 1.2.3 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: DVD backup tool for Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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 -Patch1: k9copy-14.0.0-fix_k3b_link.patch -Patch2: k9copy-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: desktop-file-utils BuildRequires: trinity-k3b-devel +BuildRequires: autoconf automake libtool m4 +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 + # Warning: the target distribution must have ffmpeg ! BuildRequires: ffmpeg-devel Requires: ffmpeg +# DVDREAD support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}dvdread-devel +%else +BuildRequires: libdvdread-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 +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-Mesa-libGLU +%endif + %description k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 @@ -63,21 +111,26 @@ to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). This is the Trinity version. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ftbfs # Removes internal dvdread headers -%__rm -rf dvdread +%__rm -rf "dvdread" + +# Fix permissions on doc files +chmod -x AUTHORS COPYING %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -123,17 +176,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -146,5 +188,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec index bd6788c62..a7a026ab9 100644 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k9copy %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: DVD backup tool for Trinity Version: 1.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -81,7 +76,7 @@ This is the Trinity version. %__rm -rf dvdread %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -149,30 +144,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3 -- Initial release for TDE 3.5.13.1 - -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 -- Add support for MGA2 and MDV2011 -- Fix 'format not a string literal' error. Clean up warning. [Commit #3bfc84b0] -- Fix FTBFS [Commit #62acebb7] -- Fix 'format not a string literal' error [Commit #d9ed8b32] -- Fix remaining string format errors [Commit #a8e98ad9] -- Fix another string format error [Commit #b3bb8a8f] -- Fix FTBFS [Commit #ca864ede] -- Fix format string error [Commit #a016df82] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2 -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch new file mode 100644 index 000000000..f6a362d40 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch @@ -0,0 +1,14 @@ +--- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI 2013-07-29 21:52:57.859615464 +0200 ++++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h 2013-07-29 21:57:19.206481299 +0200 +@@ -43,7 +43,11 @@ + #else + typedef int (*av_find_stream_info_t)(AVFormatContext *); + #endif ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0) ++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID); ++#else + typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID); ++#endif + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) + typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **); + #else diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch new file mode 100644 index 000000000..f7858c0a0 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch @@ -0,0 +1,11 @@ +--- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI 2013-06-17 20:59:49.620929488 +0200 ++++ trinity-k9copy-3.5.13.2/src/Makefile.am 2013-06-17 21:00:11.150425671 +0200 +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) ++ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch new file mode 100644 index 000000000..4dfb39787 --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch @@ -0,0 +1,18 @@ +--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200 ++++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200 +@@ -21,6 +21,9 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#ifndef __MPEG2_INTERNAL_H__ ++#define __MPEG2_INTERNAL_H__ ++ + /* macroblock modes */ + #define MACROBLOCK_INTRA 1 + #define MACROBLOCK_PATTERN 2 +@@ -298,3 +301,5 @@ + extern mpeg2_mc_t mpeg2_mc_altivec; + extern mpeg2_mc_t mpeg2_mc_alpha; + extern mpeg2_mc_t mpeg2_mc_vis; ++ ++#endif // __MPEG2_INTERNAL_H__ diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch new file mode 100644 index 000000000..0cf01006e --- /dev/null +++ b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch @@ -0,0 +1,102 @@ +--- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -14,5 +14,5 @@ + k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \ + k9menueditor.h k9newdvd.h k9newtitle.h k9title.h + libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI) +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes) +--- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -12,7 +12,7 @@ + motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \ + mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \ + uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ + -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy + + noinst_HEADERS = k9decodethread.h k9plaympeg2.h +--- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ + $(HAL_INCS) $(K3B_INCS) $(all_includes) + METASOURCES = AUTO + libk9devices_la_LDFLAGS = $(all_libraries) +--- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes) ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes) + METASOURCES = AUTO + + noinst_LTLIBRARIES = libk9mplayer.la +--- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -7,6 +7,6 @@ + noinst_LTLIBRARIES = libk9vamps.la + libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \ + k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ + -I$(top_srcdir)/libk9copy + noinst_HEADERS = k9requant.h ac.h k9fifo.h +--- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -11,4 +11,4 @@ + + + +-INCLUDES = -I$(top_srcdir)/dvdread ++INCLUDES = -I/usr/include/dvdread +--- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 ++++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200 +@@ -24,6 +24,6 @@ + k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h + + +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav + libk9copy_la_LDFLAGS = $(all_libraries) +--- ./src/Makefile.am.dvdread 2013-07-28 20:05:20.855621729 +0200 ++++ ./src/Makefile.am 2013-07-28 20:09:10.620642017 +0200 +@@ -1,5 +1,5 @@ + # set the include path for X, qt and KDE +-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \ ++INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \ + -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \ + -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes) + +@@ -35,7 +35,7 @@ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ + $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ +- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice ++ -ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice + + # this is where the desktop file will go + shelldesktopdir = $(kde_appsdir)/Utilities +--- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200 ++++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ ++SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ + po src + + $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs +@@ -29,11 +29,3 @@ + + AM_CXXFLAGS = -O0 -g3 + +- +- +- +- +- +- +- +-INCLUDES = -I$(top_srcdir)/dvdread diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec index 767dd726b..f9d3be544 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec @@ -1,10 +1,24 @@ +# +# spec file for package kaffeine-mozilla (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/ +# + # Default version for this component %define tde_pkg kaffeine-mozilla +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif # TDE specific building variables @@ -23,11 +37,14 @@ %define _docdir %{tde_docdir} +%if 0%{?fedora} >= 27 +%define debug_package %{nil} +%endif Name: trinity-%{tde_pkg} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -80,7 +97,7 @@ when a page containing a supported media format is loaded. %patch1 -p1 -b .nspr %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" %__make -f "admin/Makefile.common" @@ -115,13 +132,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README @@ -131,5 +141,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-6 -- Initial release for TDE 14.0.0 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 index 018c2d05b..e00b81a06 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kaffeine-mozilla -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -78,7 +73,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh %patch1 -p1 %__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . autoreconf -fiv @@ -123,12 +118,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3 -- Initial release for TDE 3.5.13.1 - -* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2 -- Rebuild with nicer patch. - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - 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 index 21fc166b0..b2230c6b3 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kaffeine-mozilla %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -83,7 +78,7 @@ when a page containing a supported media format is loaded. %patch2 -p1 -b .automake %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" %__make -f "admin/Makefile.common" @@ -134,18 +129,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3 -- Initial release for TDE 3.5.13.1 - -* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2 -- Rebuild with nicer patch. - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec index dfbc6152d..fdaafa4b0 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kaffeine-mozilla -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] Version: 0.4.3.1 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -68,7 +63,7 @@ unset QTDIR; . /etc/profile.d/qt.sh %patch1 -p1 %__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . autoreconf -fiv @@ -112,10 +107,4 @@ export PATH="%{tde_bindir}:${PATH}" %{_libdir}/mozilla/plugins/kaffeineplugin.so -%Changelog -* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2 -- Rebuild with nicer patch. - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - +%changelog diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index fd64b2898..d38e6a27d 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec @@ -1,49 +1,83 @@ -# Default version for this component -%define tde_pkg kaffeine +# +# 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.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kaffeine +%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 -%define _docdir %{tde_docdir} Name: trinity-%{tde_pkg} -Summary: Xine-based media player - +Epoch: %{tde_epoch} Version: 0.8.8 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Xine-based media player Group: Applications/Multimedia URL: http://kaffeine.sourceforge.net/ -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +%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) -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc + BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +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 + # VORBIS support BuildRequires: libvorbis-devel @@ -56,7 +90,7 @@ BuildRequires: libcdda-devel BuildRequires: cdparanoia BuildRequires: cdparanoia-devel %endif -%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 +%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7 BuildRequires: libcdio-paranoia-devel %endif @@ -87,20 +121,21 @@ BuildRequires: libxcb-devel # 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 +%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%{?fedora} -BuildRequires: gstreamer-plugins-base-devel >= 0.10 +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libgstreamer-devel >= 0.10 -BuildRequires: libgstreamer-plugins-base-devel >= 0.10 +%if 0%{?rhel} >= 7 || 0%{?fedora} +BuildRequires: gstreamer1-devel >= 1.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif %endif @@ -108,12 +143,8 @@ BuildRequires: libgstreamer-plugins-base-devel >= 0.10 %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 @@ -123,11 +154,29 @@ BuildRequires: libxine-devel %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 +%if 0%{?mgaversion} >= 6 +BuildRequires: %{_lib}mp3lame-devel +%else +BuildRequires: %{_lib}lame-devel +%endif +%endif +%endif %if 0%{?suse_version} BuildRequires: libmp3lame-devel -%else +%endif +%if 0%{?fedora} || 0%{?rhel} BuildRequires: lame-devel %endif +%endif +%endif # WTF support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -139,7 +188,7 @@ BuildRequires: kernel-headers BuildRequires: glibc-kernheaders %endif -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %description Kaffeine is a xine-based media player for TDE. It plays back CDs, @@ -167,24 +216,12 @@ Konqueror plugin, OSD and much more. %{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: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel %description devel @@ -196,12 +233,6 @@ Requires: trinity-tdelibs-devel %{tde_libdir}/lib*.so %exclude %{tde_libdir}/libkaffeinepart.so -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %package libs @@ -209,7 +240,7 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries # include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. @@ -218,15 +249,9 @@ Requires: %{name} = %{version}-%{release} %defattr(-,root,root,-) %{tde_libdir}/lib*.so.* -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -236,7 +261,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -291,5 +316,3 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec index 298618821..e46e985cc 100644 --- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec +++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kaffeine %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: Xine-based media player Version: 0.8.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -236,7 +231,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -292,37 +287,3 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-7 -- Mageia 3: rebuild against Xine 1.2 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4 -- Initial release for TDE 3.5.13.1 - -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3 -- Add support for Mageia 2 and Mandriva 2011 -- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3] -- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358] - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2 -- Rebuilt for Fedora 17 -- Adds more patches from GIT. - -* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1 -- Updates version to 0.8.8 -- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] -- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME. -- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559] -- Add man page - -* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2 -- Disable 'libxcb-devel' for RHEL 5 compilation -- Fix HTML directory location - -* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1 -- Spec file based on Fedora 8 'kaffeine-0.8.6-3' diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca-14.0.0.spec index 799da2d99..3a92fd87c 100644 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec +++ b/redhat/applications/kasablanca/kasablanca-14.0.0.spec @@ -1,53 +1,93 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package kasablanca (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg kasablanca -%define tde_version 14.0.0 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Graphical FTP client +Epoch: %{tde_epoch} Version: 0.4.0.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Url: http://kasablanca.berlios.de/ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical FTP client for Trinity Group: Applications/Internet +Url: http://kasablanca.berlios.de/ + +%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 -Patch1: kasablanca-14.0.0-fix_ftp.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 + +BuildRequires: autoconf automake libtool m4 +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 + +# OPENSSL support BuildRequires: openssl-devel +# UTEMPTER support %if 0%{?suse_version} BuildRequires: utempter-devel -%else +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}utempter-devel +%endif +%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} == 4 %else BuildRequires: libutempter-devel @@ -65,24 +105,26 @@ Kasablanca is an ftp client, among its features are currently: * small nifty features, like a skiplist. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftpthread %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" ## Needed(?) for older/legacy setups, harmless otherwise if pkg-config openssl ; then @@ -116,26 +158,16 @@ export PATH="%{tde_bindir}:${PATH}" # locale's %find_lang %{tde_pkg} +# Fix desktop files (openSUSE only) +%if 0%{?suse_version} +%suse_update_desktop_file kasablanca Network FileTransfer +%endif + %clean %__rm -rf $RPM_BUILD_ROOT -%post -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README @@ -144,19 +176,7 @@ gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : %{tde_datadir}/config.kcfg/kbconfig.kcfg %{tde_datadir}/icons/hicolor/*/apps/kasablanca.png %{tde_tdedocdir}/HTML/en/kasablanca/ -%{tde_datadir}/applnk/Utilities/kasablanca.desktop +%{tde_tdeappdir}/kasablanca.desktop %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-4 -- Initial release for TDE 14.0.0 - -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2 -- Initial release for TDE 3.5.13.1 - -* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17' diff --git a/redhat/applications/katapult/katapult-14.0.0.spec b/redhat/applications/katapult/katapult-14.0.0.spec index f7f079136..c0b615df2 100644 --- a/redhat/applications/katapult/katapult-14.0.0.spec +++ b/redhat/applications/katapult/katapult-14.0.0.spec @@ -1,52 +1,79 @@ -# Default version for this component -%define tde_pkg katapult +# +# spec file for package katapult (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg katapult +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Faster access to applications, bookmarks, and other items. +Epoch: %{tde_epoch} Version: 0.3.2.1 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Faster access to applications, bookmarks, and other items. Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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-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: autoconf automake libtool m4 +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 %description Katapult is an application for TDE, designed to allow faster access to @@ -56,16 +83,20 @@ plugins as well, so its appearance is completely customizable. It was inspired by Quicksilver for OS X. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -103,25 +134,15 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/*.so %__rm -f %{?buildroot}%{tde_libdir}/*.la -%clean -%__rm -rf %{buildroot} - +# 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 +%endif -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -177,5 +198,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec index 20afee2a5..c26f46fbd 100644 --- a/redhat/applications/katapult/katapult-3.5.13.2.spec +++ b/redhat/applications/katapult/katapult-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg katapult %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -65,7 +60,7 @@ inspired by Quicksilver for OS X. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -176,26 +171,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-7 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-5 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4 -- Rebuilt for Fedora 17 -- Fix post and postun - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-3 -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1 -- Initial release for RHEL 6.0 -- Import to GIT - diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec index 5f122bd1a..6938322cb 100644 --- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec +++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec @@ -1,57 +1,87 @@ -# Default version for this component -%define tde_pkg kbarcode +# +# spec file for package kbarcode (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kbarcode +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -########## Name: trinity-%{tde_pkg} -Summary: barcode and label printing application for Trinity +Epoch: %{tde_epoch} Version: 2.0.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: barcode and label printing application for Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.kbarcode.net -Prefix: %{tde_prefix} +%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-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}-tdefile-plugin = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +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 + +# PCRE support +BuildRequires: pcre-devel + +Requires: %{name}-tdefile-plugin = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -73,16 +103,6 @@ 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. -%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 @@ -106,7 +126,7 @@ update-desktop-database %{tde_appdir} &> /dev/null %package tdefile-plugin Summary: tdefile-plugin for %{name} Group: Applications/Utilities -#Requires: %{name} = %{version}-%{release} +#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description tdefile-plugin %{summary}. @@ -119,7 +139,7 @@ Group: Applications/Utilities ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -129,7 +149,7 @@ Group: Applications/Utilities %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -164,9 +184,18 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - %find_lang %{tde_pkg} +# Fix invalid icon path +%__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|" + +# 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 +%endif %clean @@ -174,5 +203,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec index 24a59f391..1713feaab 100644 --- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec +++ b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbarcode %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: barcode and label printing application for Trinity Version: 2.0.6 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -80,7 +75,7 @@ to use them in another application. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -157,14 +152,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec index 6721d1cc6..50da69568 100644 --- a/redhat/applications/kbfx/kbfx-14.0.0.spec +++ b/redhat/applications/kbfx/kbfx-14.0.0.spec @@ -1,53 +1,100 @@ -# Default version for this component -%define tde_pkg kbfx +# +# spec file for package kbfx (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kbfx +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: an alternative to K-Menu for TDE [Trinity] +Epoch: %{tde_epoch} Version: 0.4.9.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An alternative to K-Menu for TDE Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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-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 libtool +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 + +# 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 + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description KBFX is an alternative to the classical K-Menu button and its menu. @@ -60,10 +107,14 @@ bar a try. Homepage: http://www.kbfx.org -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -123,28 +174,27 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build VERBOSE=1 +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility +%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop +%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop +%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop +%suse_update_desktop_file %{buildroot}%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop +%suse_update_desktop_file %{buildroot}%{tde_datadir}/applications/tde/kbfx_theme.desktop +%endif + %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/ +%dir %{tde_libdir}/kbfx +%dir %{tde_libdir}/kbfx/plugins %{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la %{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so %{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la @@ -161,7 +211,8 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_tdelibdir}/kbfxspinx.so %{tde_tdeappdir}/kbfx_theme.desktop %{tde_tdeappdir}/kbfxconfigapp.desktop -%{tde_datadir}/apps/kbfx/skins/*/* +%{tde_datadir}/apps/kbfx/ +%dir %{tde_datadir}/apps/kbfxconfigapp %{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop @@ -178,5 +229,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec index 0af953f7d..f3e9f4694 100644 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbfx %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -176,14 +171,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2 -- Initial release for TDE 3.5.13.1 - -* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kbibtex/kbibtex-14.0.0.spec b/redhat/applications/kbibtex/kbibtex-14.0.0.spec index f5d20b725..2405bd5ab 100644 --- a/redhat/applications/kbibtex/kbibtex-14.0.0.spec +++ b/redhat/applications/kbibtex/kbibtex-14.0.0.spec @@ -1,67 +1,109 @@ -# Default version for this component -%define tde_pkg kbibtex +# +# spec file for package kbibtex (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kbibtex +%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 -%define _docdir %{tde_docdir} -Name: trinity-kbibtex +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 0.2.3 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A BibTeX editor for TDE - Group: Applications/Internet -License: GPLv2+ URL: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%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-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: autoconf automake libtool m4 +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 + +# XSLT support +BuildRequires: libxslt-devel + + %description KBibTeX is a BibTeX editor for TDE to edit bibliographies used with LaTeX. KBibTeX is released under the GNU Public License (GPL) version 2 or any later version. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -93,26 +135,16 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database +%endif + %clean %__rm -rf $RPM_BUILD_ROOT -%post -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_tdeappdir} > /dev/null - -%postun -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_tdeappdir} > /dev/null - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING NEWS README TODO ChangeLog @@ -121,7 +153,9 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %{tde_tdelibdir}/libkbibtexpart.so %{tde_tdeappdir}/kbibtex.desktop %{tde_datadir}/apps/kbibtex/ +%dir %{tde_datadir}/apps/kbibtexpart %{tde_datadir}/apps/kbibtexpart/kbibtex_part.rc +%dir %{tde_datadir}/apps/kbibtexpart/xslt %{tde_datadir}/apps/kbibtexpart/xslt/MARC21slim2MODS3.xsl %{tde_datadir}/apps/kbibtexpart/xslt/MARC21slimUtils.xsl %{tde_datadir}/apps/kbibtexpart/xslt/UNIMARC2MODS3.xsl @@ -133,8 +167,3 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.3-2 -- Initial release for TDE 14.0.0 - -* Fri Mar 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.3-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index ac1633c80..1ca90aebc 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -1,50 +1,84 @@ -# Default version for this component -%define tde_pkg kbiff +# +# spec file for package kbiff (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kbiff +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 3.9 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: TDE mail notification utility - +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE mail notification utility Group: Applications/Internet -License: GPLv2+ URL: http://www.trinitydesktop.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%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: tqt3-compat-headers >= 3.5.0 -BuildRequires: libtqt4-devel >= 2:4.2.0 -BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +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 + + %description Kbiff is a "xbiff"-like mail notification utility. It has multiple pixmaps, session management, and GUI configuration. It can "dock" into the TDE panel. @@ -52,15 +86,19 @@ It can display animated gifs, play system sounds, or run arbitrary shell command when new mail arrives. It supports mbox, maildir, mh, POP3, IMAP4, and NNTP mailboxes. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -84,7 +122,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-closure \ --enable-rpath \ --disable-gcc-hidden-visibility - + %__make %{?_smp_mflags} @@ -94,23 +132,19 @@ export PATH="%{tde_bindir}:${PATH}" %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" -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -for i in hicolor 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 +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" +%suse_update_desktop_file kbiff Applet +%endif -%postun -for i in hicolor 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 +%clean +%__rm -rf $RPM_BUILD_ROOT %files -f %{tde_pkg}.lang @@ -121,7 +155,7 @@ done %{tde_libdir}/libtdeinit_kbiff.so %{tde_tdelibdir}/kbiff.la %{tde_tdelibdir}/kbiff.so -%{tde_datadir}/applnk/Internet/kbiff.desktop +%{tde_tdeappdir}/kbiff.desktop %{tde_datadir}/apps/kbiff/ %{tde_datadir}/icons/hicolor/*/apps/kbiff.png %{tde_datadir}/icons/locolor/*/apps/kbiff.png @@ -133,8 +167,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.9-2 -- Initial release for TDE 14.0.0 - -* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 3.9-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec index 1ed0a672d..e58bd0381 100644 --- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec +++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec @@ -1,69 +1,101 @@ -# Default version for this component -%define tde_pkg kbookreader +# +# spec file for package kbookreader (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kbookreader +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: eBook reader for Trinity. +Epoch: %{tde_epoch} Version: 0.2.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: eBook reader for Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +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 + %description kbookreader is an application which allows you to view eBooks within the Trinity Desktop Environment. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -95,18 +127,18 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Fix desktop icon location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files @@ -114,7 +146,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %doc AUTHORS COPYING %{tde_bindir}/bookreader %{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Office/bookreader.desktop +%{tde_tdeappdir}/bookreader.desktop %{tde_datadir}/apps/bookreader/ %{tde_datadir}/config.kcfg/bookreader.kcfg %{tde_tdedocdir}/HTML/en/bookreader/ @@ -122,5 +154,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec index e538652b3..61f8a726c 100644 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbookreader %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: eBook reader for Trinity. Version: 0.2.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -63,7 +58,7 @@ within the Trinity Desktop Environment. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -121,19 +116,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.0-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec index aa7094eee..dca19c1d4 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec @@ -1,52 +1,83 @@ -# Default version for this component -%define tde_pkg kchmviewer +# +# spec file for package kchmviewer (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kchmviewer +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: CHM viewer for Trinity +Epoch: %{tde_epoch} Version: 3.1.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: CHM viewer for Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +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 + +# CHMLIB support +BuildRequires: chmlib-devel + %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. @@ -69,16 +100,20 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -124,18 +159,19 @@ export PATH="%{tde_bindir}:${PATH}" # Removes useless files %__rm -f %{?buildroot}%{tde_libdir}/*.a -%clean -%__rm -rf %{buildroot} - +# Fix desktop icon location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +# Updates applications categories for openSUSE +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" +%if 0%{?suse_version} +%suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer Office Viewer +%endif -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -144,7 +180,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %{tde_bindir}/kchmviewer %{tde_tdelibdir}/tdeio_msits.la %{tde_tdelibdir}/tdeio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop +%{tde_tdeappdir}/kchmviewer.desktop %{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %{tde_datadir}/services/msits.protocol %{tde_tdedocdir}/HTML/en/kchmviewer/ @@ -152,5 +188,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec index b8e6589e2..36012a73f 100644 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kchmviewer %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: CHM viewer for Trinity Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -78,7 +73,7 @@ support. Correctly detects and shows encoding of any valid chm file. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -148,19 +143,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.1.2-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec index 97744c8c4..723239224 100644 --- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec +++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec @@ -1,69 +1,101 @@ -# Default version for this component -%define tde_pkg kchmviewer +# +# spec file for package kcmautostart (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kcmautostart +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-kcmautostart -Summary: Manage applications automatic startup. +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Manage applications automatic startup Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 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 Requires: trinity-tdebase >= %{tde_version} + %description %{summary} -%if 0%{?suse_version} || 0%{?pclinuxos} + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -112,5 +144,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec index 9374347cc..0ccd9d6d5 100644 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec +++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kchmviewer %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-kcmautostart Summary: Manage applications automatic startup. Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -79,7 +74,7 @@ Requires: trinity-tdebase >= %{tde_version} -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -127,14 +122,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4 -- Build for Fedora 19 - -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Initial release for TDE 3.5.13.1 - -* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index b2b6646ce..b8fd4cc4b 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -1,47 +1,62 @@ -# Default version for this component -%define tde_pkg kcmldap +# +# spec file for package kcmldap (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kcmldap +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Kerberos control module for the TDE control center +Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Kerberos control module for the TDE control center Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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 @@ -49,8 +64,56 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -Requires: trinity-tde-ldap-cert-updater = %{version}-%{release} -Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release} +Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release} + +BuildRequires: autoconf automake libtool m4 +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 + +# OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif + +# HEIMDAL support +%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 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + +# LIBCOM_ERR support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 +BuildRequires: libcom_err-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ext2fs-devel +%endif + %description This is a meta-package that installs all kcmldap related packages. @@ -62,17 +125,11 @@ This is a meta-package that installs all kcmldap related packages. %package -n trinity-kcontrol-ldap-bonding Summary: Kerberos control module for the TDE control center Group: Applications/Utilities -Requires: trinity-tde-ldap-cert-updater = %{version}-%{release} +Requires: trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kcontrol-ldap-bonding This is a TDE control center module to manage TDE connections to Kerberos realms. -%post -n trinity-kcontrol-ldap-bonding -touch --no-create %{tde_datadir}/icons/hicolor || : - -%postun -n trinity-kcontrol-ldap-bonding -touch --no-create %{tde_datadir}/icons/hicolor || : - %files -n trinity-kcontrol-ldap-bonding %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING @@ -80,6 +137,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/kcm_ldapbonding.la %{tde_tdelibdir}/kcm_ldapbonding.so %{tde_tdeappdir}/ldapbonding.desktop +%dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png @@ -88,17 +146,11 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %package -n trinity-tde-ldap-cert-updater Summary: Service to keep LDAP certificates up-to-date Group: Applications/Utilities -Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release} +Requires: trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tde-ldap-cert-updater This is a small daemon which keeps the LDAP root certificate up to date with the LDAP server -%post -n trinity-tde-ldap-cert-updater -touch --no-create %{tde_datadir}/icons/hicolor || : - -%postun -n trinity-tde-ldap-cert-updater -touch --no-create %{tde_datadir}/icons/hicolor || : - %files -n trinity-tde-ldap-cert-updater %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING @@ -106,23 +158,37 @@ touch --no-create %{tde_datadir}/icons/hicolor || : ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +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}" +fi %configure \ --prefix=%{tde_prefix} \ @@ -139,7 +205,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} @@ -155,5 +224,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index dce3d3a98..88a889e4e 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -1,47 +1,61 @@ -# Default version for this component -%define tde_pkg kcmldapcontroller +# +# spec file for package kcmldapcontroller (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kcmldapcontroller +%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/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: Kerberos control module for the TDE control center +Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Kerberos control module for the TDE control center Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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 @@ -49,7 +63,58 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -Requires: trinity-kcontrol-ldap-controller = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +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 + +# OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif +%if 0%{?mgaversion} >= 6 +BuildRequires: openldap-servers-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif + +# HEIMDAL support +%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 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + +# LIBCOM_ERR support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: libcom_err-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ext2fs-devel +%endif + +Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} + %description This is a meta-package that installs all kcmldap related packages. @@ -65,44 +130,58 @@ Group: Applications/Utilities %description -n trinity-kcontrol-ldap-controller This is a TDE control center module to manage users, groups, and machines in Kerberos realms. -%post -n trinity-kcontrol-ldap-controller -update-desktop-database %{tde_tdeappdir} > /dev/null - -%postun -n trinity-kcontrol-ldap-controller -update-desktop-database %{tde_tdeappdir} > /dev/null - %files -n trinity-kcontrol-ldap-controller %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/primaryrccertupdater +%if 0%{?pclinuxos} == 0 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so +%endif %{tde_tdelibdir}/kcm_ldapcontroller.la %{tde_tdelibdir}/kcm_ldapcontroller.so %{tde_tdeappdir}/ldapcontroller.desktop -%{tde_datadir}/apps/kcmldapcontroller/skel/ +%{tde_datadir}/apps/kcmldapcontroller/ +%dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?pclinuxos} +%__rm -rf acl-updater +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +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}" +fi %configure \ --prefix=%{tde_prefix} \ @@ -119,7 +198,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} @@ -135,5 +217,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index d8df41135..008da620d 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -1,47 +1,61 @@ -# Default version for this component -%define tde_pkg kcmldapmanager +# +# spec file for package kcmldapmanager (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kcmldapmanager +%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/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: Kerberos control module for the TDE control center +Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Kerberos control module for the TDE control center Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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 @@ -49,7 +63,55 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -Requires: trinity-kcontrol-ldap-manager = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +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 + +# OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif + +# HEIMDAL support +%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 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + +# LIBCOM_ERR support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: libcom_err-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ext2fs-devel +%endif + +Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} + %description This is a meta-package that installs all kcmldap related packages. @@ -65,12 +127,6 @@ 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. -%post -n trinity-kcontrol-ldap-manager -update-desktop-database %{tde_tdeappdir} > /dev/null - -%postun -n trinity-kcontrol-ldap-manager -update-desktop-database %{tde_tdeappdir} > /dev/null - %files -n trinity-kcontrol-ldap-manager %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING @@ -81,23 +137,36 @@ update-desktop-database %{tde_tdeappdir} > /dev/null ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +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}" +fi %configure \ --prefix=%{tde_prefix} \ @@ -114,7 +183,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} @@ -130,5 +202,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcpuload/kcpuload-14.0.0.spec b/redhat/applications/kcpuload/kcpuload-14.0.0.spec index fea94414e..374b8b539 100644 --- a/redhat/applications/kcpuload/kcpuload-14.0.0.spec +++ b/redhat/applications/kcpuload/kcpuload-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg kcpuload +# +# spec file for package kcpuload (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kcpuload +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: a CPU meter for Kicker [Trinity] +Epoch: %{tde_epoch} Version: 2.00 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: CPU meter for Kicker [Trinity] Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +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 + %description KCPULoad is a small program for Kicker (the TDE panel). It shows a @@ -59,16 +86,20 @@ and various different styles. KCPULoad has support for SMP and separate user/system loads. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,34 +131,29 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Fix desktop icon location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" -%clean -%__rm -rf %{buildroot} - +# 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 +%endif -%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 +%clean +%__rm -rf %{buildroot} %files %defattr(-,root,root,-) %{tde_bindir}/kcpuload -%{tde_datadir}/applnk/System/kcpuload.desktop -%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png +%{tde_tdeappdir}/kcpuload.desktop +%{tde_datadir}/apps/kcpuload/ %{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png %{tde_datadir}/icons/locolor/*/apps/kcpuload.png %{tde_tdedocdir}/HTML/en/kcpuload/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec index a5374081e..df8ec2705 100644 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kcpuload %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: a CPU meter for Kicker [Trinity] Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -68,7 +63,7 @@ KCPULoad has support for SMP and separate user/system loads. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -128,19 +123,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-5 -- Initial release for TDE 3.5.13.1 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.00-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg-14.0.0.spec index 692fc508d..0728d9ad7 100644 --- a/redhat/applications/kdbg/kdbg-14.0.0.spec +++ b/redhat/applications/kdbg/kdbg-14.0.0.spec @@ -1,53 +1,82 @@ -# Default version for this component -%define tde_pkg kdbg +# +# spec file for package kdbg (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kdbg +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man - %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: graphical debugger interface [Trinity] +Epoch: %{tde_epoch} Version: 2.2.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical debugger interface [Trinity] Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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: autoconf automake libtool m4 +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 + %description KDbg is a graphical user interface to gdb, the GNU debugger. It provides @@ -73,7 +102,9 @@ Features include the following: * Debugging of core dumps, attaching to running processes is possible. * Conditional breakpoints. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -83,14 +114,14 @@ Features include the following: %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export kde_confdir="%{tde_confdir}" # Warning: --enable-final causes FTBFS %configure \ @@ -125,26 +156,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -update-desktop-database %{tde_tdeappdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || : - - -%postun -update-desktop-database %{tde_tdeappdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || : - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kdbg %{tde_tdeappdir}/kdbg.desktop %{tde_datadir}/apps/kdbg/ -%{tde_datadir}/config/kdbgrc +%{tde_confdir}/kdbgrc %lang(de) %{tde_tdedocdir}/HTML/de/kdbg/ %lang(en) %{tde_tdedocdir}/HTML/en/kdbg/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/ @@ -153,5 +170,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/locolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.2-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec index c8bc72170..25fbabe11 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec @@ -1,53 +1,80 @@ -# Default version for this component -%define tde_pkg kdbusnotification +# +# spec file for package kdbusnotification (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kdbusnotification +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 - -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Summary: a DBUS notification service [Trinity] - +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 0.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: a DBUS notification service [Trinity] 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) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# GTK2 stuff BuildRequires: gtk2-devel # DBUS stuff @@ -57,28 +84,32 @@ BuildRequires: dbus-1-glib-devel 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -119,5 +150,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec index 521f14897..36202497b 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdbusnotification %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: a DBUS notification service [Trinity] Version: 0.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -73,7 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %patch1 -p1 -b .utf8 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -120,22 +115,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5 -- Fix UTF8 messages - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.1-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec index acc367114..50a13a04c 100644 --- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec +++ b/redhat/applications/kdiff3/kdiff3-14.0.0.spec @@ -1,52 +1,75 @@ -# Default version for this component -%define tde_pkg kdiff3 +# +# spec file for package kdiff3 (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kdiff3 +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%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:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.91 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + %description Shows the differences line by line and character by character (!). @@ -56,16 +79,20 @@ Supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.). Unicode & UTF-8 support -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -109,19 +136,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -142,5 +156,3 @@ done %{tde_tdelibdir}/libkdiff3plugin.so %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-9 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec index 92c2bf2a8..e4099e05b 100644 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdiff3 %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -65,7 +60,7 @@ Unicode & UTF-8 support %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -141,35 +136,3 @@ done %{tde_tdelibdir}/libkdiff3plugin.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-8 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Fix post and postun -- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -- Remove additional unneeded tq method conversions [Commit #9b57232f] -- Rename obsolete tq methods to standard names [Commit #d654b107] - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/applications/kdirstat/kdirstat-14.0.0.spec b/redhat/applications/kdirstat/kdirstat-14.0.0.spec index 9e66a5e9d..26f4a0c70 100644 --- a/redhat/applications/kdirstat/kdirstat-14.0.0.spec +++ b/redhat/applications/kdirstat/kdirstat-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg kdirstat +# +# spec file for package kdirstat (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kdirstat +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.4.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Graphical disk usage display with cleanup facilities [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-%{tde_pkg} -Summary: graphical disk usage display with cleanup facilities [Trinity] -Version: 2.4.4 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KDirStat (TDE Directory Statistics) is a small utility program that sums @@ -61,16 +88,20 @@ shell of your choice, compress it to a .tar.bz2 archive, or define your own cleanup actions. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -106,28 +137,24 @@ 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}" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem +%endif -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kdirstat -%{tde_datadir}/applnk/Utilities/kdirstat.desktop +%{tde_tdeappdir}/kdirstat.desktop %{tde_datadir}/apps/tdeconf_update/fix_move_to_trash_bin.pl %{tde_datadir}/apps/tdeconf_update/kdirstat.upd %{tde_datadir}/apps/kdirstat/ @@ -137,5 +164,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec index be40fd152..7eae449e0 100644 --- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec +++ b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdirstat %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: graphical disk usage display with cleanup facilities [Trinity] Version: 2.4.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -70,7 +65,7 @@ own cleanup actions. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -136,18 +131,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.4.4-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2 -- Rebuilt for Fedora 17 -- Fix post and postun - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep-14.0.0.spec index dbd4d6243..56557f0e5 100644 --- a/redhat/applications/keep/keep-14.0.0.spec +++ b/redhat/applications/keep/keep-14.0.0.spec @@ -1,56 +1,85 @@ -# Default version for this component -%define tde_pkg keep +# +# spec file for package keep (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg keep +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: backup system for TDE [Trinity] -Version: 0.4.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Backup system for TDE [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + 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. @@ -58,23 +87,26 @@ the backup, including the frequency and the number of backups. Homepage: http://jr.falleri.free.fr/keep -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -103,19 +135,14 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup +%endif -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -132,5 +159,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec index c8b439979..7dba42000 100644 --- a/redhat/applications/keep/keep-3.5.13.2.spec +++ b/redhat/applications/keep/keep-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg keep %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: backup system for TDE [Trinity] Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -67,7 +62,7 @@ Homepage: http://jr.falleri.free.fr/keep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -131,17 +126,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2 -- Rebuilt for Fedora 17 - -* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index f23de31f9..de55e48e7 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -1,47 +1,61 @@ -# Default version for this component -%define tde_pkg kerberostray +# +# spec file for package kerberostray (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kerberostray +%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/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: Kerberos ticket manager +Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Kerberos ticket manager Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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-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 @@ -49,28 +63,89 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 +BuildRequires: autoconf automake libtool m4 +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 + +# OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel +%endif + +# HEIMDAL support +%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 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + +# LIBCOM_ERR support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: libcom_err-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ext2fs-devel +%endif + + %description Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +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}" +fi %configure \ --prefix=%{tde_prefix} \ @@ -87,7 +162,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} @@ -97,23 +175,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Apps that should stay in TDE +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %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} > /dev/null - - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -update-desktop-database %{tde_tdeappdir} > /dev/null - - %files %{tde_bindir}/kerberostray %{tde_tdeappdir}/kerberostray.desktop @@ -123,5 +192,3 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec index 16e3c36f9..8cb5a96fb 100644 --- a/redhat/applications/kerry/kerry-14.0.0.spec +++ b/redhat/applications/kerry/kerry-14.0.0.spec @@ -1,10 +1,24 @@ +# +# spec file for package kerry (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/ +# + # Default version for this component %define tde_pkg kerry +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif # TDE specific building variables @@ -27,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: a TDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -75,7 +89,7 @@ filesystems, chat logs, mail and data, RSS and other. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -119,19 +133,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo @@ -153,14 +154,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-4 -- Initial release for TDE 14.0.0 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2 -- Initial release for TDE 3.5.13.1 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec index 9bc265341..c1fbec722 100644 --- a/redhat/applications/kerry/kerry-3.5.13.1.spec +++ b/redhat/applications/kerry/kerry-3.5.13.1.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -79,7 +74,7 @@ filesystems, chat logs, mail and data, RSS and other. -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -151,8 +146,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2 -- Initial release for TDE 3.5.13.1 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec index 09949032e..eb48b72c8 100644 --- a/redhat/applications/kerry/kerry-3.5.13.2.spec +++ b/redhat/applications/kerry/kerry-3.5.13.2.spec @@ -1,11 +1,6 @@ # Default version for this component %define tdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -79,7 +74,7 @@ filesystems, chat logs, mail and data, RSS and other. -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -151,11 +146,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2 -- Initial release for TDE 3.5.13.1 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec index 49b070395..ead20877c 100644 --- a/redhat/applications/kerry/kerry-3.5.13.spec +++ b/redhat/applications/kerry/kerry-3.5.13.spec @@ -1,11 +1,6 @@ # Default version for this component %define kdecomp kerry -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{kdecomp} Summary: a KDE frontend for the Beagle desktop search daemon [Trinity] Version: 0.2.1 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -78,7 +73,7 @@ filesystems, chat logs, mail and data, RSS and other. -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -148,6 +143,4 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/icons/hicolor/*/*/* -%Changelog -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec new file mode 100644 index 000000000..0f3cda990 --- /dev/null +++ b/redhat/applications/keximdb/keximdb.spec @@ -0,0 +1,157 @@ +# +# spec file for package keximdb (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg keximdb +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: MS Access (MDB) driver for Kexi [Trinity] +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +BuildRequires: trinity-koffice-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 +MDB migration driver for converting MS Access databases in MDB files +into KexiDB databases. + +This driver allows Kexi, the KOffice database program, to convert MDB +database files to Kexi databases via the Tools->Migration->Import Database +menu option. Note that this package does not allow MDB files to be opened +directly - they must be converted to a Kexi database first. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +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 \ + --disable-gcc-hidden-visibility \ + \ + --with-kexidb-libraries=%{tde_libdir} + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/keximigrate_mdb.la +%{tde_tdelibdir}/keximigrate_mdb.so +%{tde_datadir}/services/keximigrate_mdb.desktop + + +%post + + +%postun + + +%changelog diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch new file mode 100644 index 000000000..f8e019e63 --- /dev/null +++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch @@ -0,0 +1,39 @@ +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-14.0.0.spec index 67d590624..75cb03836 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec @@ -1,47 +1,84 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package kftprgrabber (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg kftpgrabber -%define tde_version 14.0.0 - - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 0.8.1 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: A FTP client for TDE. - +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A FTP client for TDE Group: Applications/Internet -License: GPLv2+ URL: http://www.kftp.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%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 +Patch0: %{tde_pkg}-14.0.0.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: autoconf automake libtool m4 +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 + +# OPENSSL support +BuildRequires: openssl-devel + %description KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It @@ -77,22 +114,26 @@ Requires: %{name} = %{version}-%{release} %{summary} -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .orig %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 QTDIR export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -125,20 +166,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf $RPM_BUILD_ROOT -%post -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 - - -%postun -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 - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog @@ -154,10 +181,7 @@ done %{tde_tdelibdir}/kftpimportplugin_ncftp.la %{tde_tdelibdir}/kftpimportplugin_ncftp.so %{tde_tdeappdir}/kftpgrabber.desktop -%{tde_datadir}/apps/kftpgrabber/commands.xml -%{tde_datadir}/apps/kftpgrabber/kftpgrabber-bi-wizard.png -%{tde_datadir}/apps/kftpgrabber/kftpgrabber-logo.png -%{tde_datadir}/apps/kftpgrabber/kftpgrabberui.rc +%{tde_datadir}/apps/kftpgrabber/ %{tde_datadir}/config.kcfg/kftpgrabber.kcfg %{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png %{tde_datadir}/services/kftpimportplugin_filezilla3.desktop @@ -170,14 +194,9 @@ done %files devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/kftpgrabber/kftpbookmarkimportplugin.h +%{tde_tdeincludedir}/kftpgrabber/ %{tde_libdir}/libkftpinterfaces.la %{tde_libdir}/libkftpinterfaces.so %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2 -- Initial release for TDE 14.0.0 - -* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.1-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec index a0f0eec9f..c78610f1c 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec @@ -1,54 +1,104 @@ -# Default version for this component -%define tde_pkg kgtk-qt3 +# +# spec file for package kgtk-qt3 (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kgtk-qt3 +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: Use TDE dialogs in Gtk apps +Epoch: %{tde_epoch} Version: 0.10.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Use TDE dialogs in Gtk apps Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org -Prefix: %{tde_prefix} +%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-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: cmake libtool +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 + +# IDN support +BuildRequires: libidn-devel + +# GTK2 support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: gtk2-devel +%else +BuildRequires: gtk+2.0-devel +%endif + +# GAMIN support +# Not on openSUSE. +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_gamin 1 +BuildRequires: gamin-devel +%endif + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description This is an LD_PRELOAD hack that allows most GTK @@ -60,10 +110,14 @@ with this TDE module/application. This package includes the kqt3-wrapper -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -73,10 +127,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ @@ -131,5 +185,3 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" %{tde_datadir}/kgtk/preload %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-7 -- Initial release for TDE 14.0.0 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 index 6e75780c7..6bde2ebd1 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kgtk-qt3 %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Use TDE dialogs in Gtk apps Version: 0.10.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -129,21 +124,3 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" %{tde_datadir}/kgtk/preload %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.2-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4 -- Initial release for TDE 3.5.13.1 - -* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3 -- Add 'preload' file for startkde script - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile-14.0.0.spec index f590da88a..33bc88722 100644 --- a/redhat/applications/kile/kile-14.0.0.spec +++ b/redhat/applications/kile/kile-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg kile +# +# spec file for package kile (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kile +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: TDE Integrated LaTeX Environment [Trinity] +Epoch: %{tde_epoch} Version: 2.0.3 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE Integrated LaTeX Environment [Trinity] Group: Applications/Publishing - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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-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: autoconf automake libtool m4 +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 + Obsoletes: %{name}-i18n-ar Obsoletes: %{name}-i18n-bg Obsoletes: %{name}-i18n-br @@ -110,16 +137,20 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -160,22 +191,16 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kile Office WordProcessor +%endif + %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 @@ -199,5 +224,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec index 320b18726..9967337e3 100644 --- a/redhat/applications/kile/kile-3.5.13.2.spec +++ b/redhat/applications/kile/kile-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kile %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Integrated LaTeX Environment [Trinity] Version: 2.0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -119,7 +114,7 @@ Kile can support large projects consisting of several smaller files. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -197,24 +192,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3 -- Rebuilt for Fedora 17 -- Removes the XPM icon - -* Fri Apr 20 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2 -- Fix file conflict with trinity-kdelibs - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima-14.0.0.spec index 427cf505a..8cbd7bce1 100644 --- a/redhat/applications/kima/kima-14.0.0.spec +++ b/redhat/applications/kima/kima-14.0.0.spec @@ -1,54 +1,88 @@ -# Default version for this component -%define tde_pkg kima +# +# spec file for package kima (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kima +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: kicker monitoring applet [Trinity] +Epoch: %{tde_epoch} Version: 0.7.3.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Kicker monitoring applet [Trinity] Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.elliptique.net/~ken/kima/ -Prefix: %{tde_prefix} +%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-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: autoconf automake libtool m4 +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 + +# UDEV support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + %description This applet monitors various temperature, @@ -56,16 +90,20 @@ frequency and fan sources in your kicker panel. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -118,5 +156,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec index 840d1c1bf..aad28627b 100644 --- a/redhat/applications/kima/kima-3.5.13.2.spec +++ b/redhat/applications/kima/kima-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kima %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: kicker monitoring applet [Trinity] Version: 0.7.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -72,7 +67,7 @@ panel. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -124,18 +119,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2 -- Rebuilt for Fedora 17 -- Fix post and postun - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kiosktool/kiosktool-14.0.0.spec b/redhat/applications/kiosktool/kiosktool-14.0.0.spec index 082588be5..a2b9bbc37 100644 --- a/redhat/applications/kiosktool/kiosktool-14.0.0.spec +++ b/redhat/applications/kiosktool/kiosktool-14.0.0.spec @@ -1,53 +1,83 @@ -# Default version for this component -%define tde_pkg kiosktool +# +# spec file for package kiosktool (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kiosktool +%define tde_prefix /opt/trinity +%define tde_appdir %{tde_datadir}/applications %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} -Summary: tool to configure the TDE kiosk framework - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Tool to configure the TDE kiosk framework Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +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: autoconf automake libtool m4 +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 + %description A Point&Click tool for system administrators to enable @@ -55,22 +85,27 @@ TDE's KIOSK features or otherwise preconfigure TDE for groups of users. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 kde_confdir="%{tde_confdir}" %configure \ --prefix=%{tde_prefix} \ @@ -99,21 +134,21 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +%__mkdir_p "%{?buildroot}%{tde_confdir}" +cat <<EOF >"%{?buildroot}%{tde_confdir}/kiosktoolrc" +[General] +GroupBlacklist=bin,daemon,sys,tty,disk,lp,www,kmem,wheel,mail,news,uucp,shadow,utmp,at,xok,named,ftp,postfix,maildrop,man,sshd,distcc,nobody,nogroup +EOF -%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 ||: +# 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 +%endif -%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 ||: +%clean +%__rm -rf $RPM_BUILD_ROOT %files -f %{tde_pkg}.lang @@ -122,12 +157,9 @@ update-desktop-database >& /dev/null ||: %{tde_bindir}/kiosktool %{tde_bindir}/kiosktool-tdedirs %{tde_tdeappdir}/kiosktool.desktop -%{tde_datadir}/apps/kiosktool/*.png +%{tde_datadir}/apps/kiosktool/ %{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 +%{tde_confdir}/kiosktoolrc %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec index d37887fe3..68c088ba5 100644 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kiosktool %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 1.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} Summary: tool to configure the TDE kiosk framework License: GPLv2+ @@ -64,7 +59,7 @@ groups of users. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -128,21 +123,3 @@ update-desktop-database >& /dev/null ||: %{tde_datadir}/apps/kiosktool/kiosktoolui.rc %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Rebuilt for Fedora 17 -- Fix post and postun - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec index 78d7d28db..60c79d547 100644 --- a/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec +++ b/redhat/applications/kkbswitch/kkbswitch-14.0.0.spec @@ -1,52 +1,80 @@ -# Default version for this component -%define tde_pkg kkbswitch +# +# spec file for package kkbswitch (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kkbswitch +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - Name: trinity-%{tde_pkg} -Summary: keyboard layout indicator for TDE +Epoch: %{tde_epoch} Version: 1.4.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Keyboard layout indicator for TDE Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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-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: autoconf automake libtool m4 +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 + %description KKBSwitch displays an icon in the system tray that indicates which layout is @@ -61,16 +89,20 @@ Features include: - Configurable keyboard shortcuts. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -106,26 +138,26 @@ 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}" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{tde_pkg} System TrayIcon +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO %{tde_bindir}/kkbswitch -%{tde_datadir}/applnk/Utilities/kkbswitch.desktop -%{tde_datadir}/apps/kkbswitch/group_names +%{tde_tdeappdir}/kkbswitch.desktop +%{tde_datadir}/apps/kkbswitch/ %{tde_datadir}/apps/tdeconf_update/kkbswitch.upd %{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons %{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_options @@ -136,5 +168,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.3-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index 4787b9a2d..d195bf8da 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -1,71 +1,99 @@ -# Default version for this component -%define tde_pkg klcddimmer +# +# spec file for package klcddimmer (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg klcddimmer +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - Name: trinity-%{tde_pkg} -Summary: Applet to adjust LCD brightness for TDE +Epoch: %{tde_epoch} Version: 0.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Applet to adjust LCD brightness for TDE Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{tde_prefix} +%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-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: autoconf automake libtool m4 +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 + %description -KKBSwitch displays an icon in the system tray that indicates which -layout is KLcdDimmer is applet for simple adjust LCD brightness. -Notice that this applet relies on an external program to get/set the -brightness. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -104,15 +132,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 LICENSE NEWS README @@ -124,5 +143,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec index 9425c3f6e..f68698644 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec @@ -1,52 +1,82 @@ -# Default version for this component -%define tde_pkg kmplayer +# +# spec file for package kmplayer (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kmplayer +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: media player for Trinity -Version: 0.10.0c -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.10.0c +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Media player for Trinity +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ +#URL: http://kmplayer.kde.org -License: GPLv2+ -Group: Applications/Multimedia +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + # DBUS support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} @@ -54,36 +84,28 @@ BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} # 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 +BuildRequires: %{_lib}gstreamer1.0-devel +BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel %endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel -#BuildRequires: gstreamer-plugins-devel +BuildRequires: gstreamer-plugins-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} 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 +%if 0%{?rhel} >= 7 || 0%{?fedora} +BuildRequires: gstreamer1-devel >= 1.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %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 @@ -117,7 +139,8 @@ BuildRequires: dbus-1-glib-devel BuildRequires: dbus-glib-devel %endif -Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release} + %description A basic audio/video viewer application for Trinity. @@ -135,6 +158,24 @@ KMPlayer can: * Lots of configurable shortcuts. Highly recommended for the VDR keys (if you have VDR) and volume increase/decrease +%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}/libtdeinit_kmplayer.la +%{tde_libdir}/libtdeinit_kmplayer.so +%{tde_tdelibdir}/kmplayer.la +%{tde_tdelibdir}/kmplayer.so +%{tde_tdeappdir}/kmplayer.desktop +%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml +%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc +%exclude %{tde_datadir}/apps/kmplayer/noise.gif +%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo +%{tde_datadir}/apps/kmplayer/ + +########## %package base Group: Applications/Multimedia @@ -143,11 +184,26 @@ Summary: Base files for KMPlayer [Trinity] %description base Core files needed for KMPlayer. +%files base +%defattr(-,root,root,-) +%{tde_libdir}/libkmplayercommon.la +%{tde_libdir}/libkmplayercommon.so +%{tde_bindir}/kgstplayer +%{tde_bindir}/kxineplayer +%{tde_confdir}/kmplayerrc +%{tde_datadir}/apps/kmplayer/bookmarks.xml +%{tde_datadir}/apps/kmplayer/noise.gif +%{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 + +########## %package konq-plugins Group: Applications/Multimedia -Requires: %{name}-base = %{version}-%{release} -Requires: trinity-tdebase >= %{tde_version} +Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konqueror >= %{tde_version} Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] %description konq-plugins @@ -156,26 +212,41 @@ This plugin enables audio/video playback inside konqueror, using Xine (with tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin browser plugins. +%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 + +########## %package doc Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Summary: Handbook for KMPlayer [Trinity] %description doc Documention for KMPlayer, a basic audio/video viewer application for TDE. +%files doc +%defattr(-,root,root,-) +%{tde_tdedocdir}/HTML/*/kmplayer -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -183,6 +254,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +export kde_confdir="%{tde_confdir}" %configure \ --prefix=%{tde_prefix} \ @@ -214,70 +286,14 @@ export PATH="%{tde_bindir}:${PATH}" # Removes unwanted files %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video +%endif + %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}/libtdeinit_kmplayer.la -%{tde_libdir}/libtdeinit_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 -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec index a919c6023..ef8bb091c 100644 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kmplayer %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: media player for Trinity Version: 0.10.0c -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -175,7 +170,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -278,24 +273,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-7 -- Mageia 3: rebuild against Xine 1.2 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-5 -- Initial release for TDE 3.5.13.2 - -* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4 -- Fix xine 1.2 support (openSUSE 12.2 only) - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2 -- Fix compilation with GCC 4.7 [Commit #5106117b] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec index 2b74b4528..a24777758 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec @@ -1,52 +1,82 @@ -# Default version for this component -%define tde_pkg kmyfirewall +# +# spec file for package kmyfirewall (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kmyfirewall +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: iptables based firewall configuration tool for TDE [Trinity] -Version: 1.1.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Iptables based firewall configuration tool for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc -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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KMyFirewall attempts to make it easier to setup iptables based firewalls on @@ -60,78 +90,6 @@ 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/config/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} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__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 @@ -173,12 +131,12 @@ done %{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}/apps/kmfgenericinterfacepart/ +%{tde_datadir}/apps/kmfipteditorpart/ +%{tde_datadir}/apps/kmfsystray/ +%{tde_datadir}/apps/kmyfirewall/ %{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_datadir}/config/kmyfirewallrc +%{tde_confdir}/kmyfirewallrc %{tde_tdedocdir}/HTML/en/kmyfirewall/ %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png @@ -189,6 +147,16 @@ done %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop +########## + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary} + %files devel %{tde_tdeincludedir}/kmyfirewall %{tde_libdir}/libkmfcore.la @@ -196,6 +164,61 @@ done %{tde_libdir}/libkmfwidgets.la %{tde_libdir}/libkmfwidgets.so +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +export PATH="%{tde_bindir}:${PATH}" +export kde_confdir="%{tde_confdir}" + +%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 \ + --disable-gcc-hidden-visibility + +%__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 "%{tde_pkg}" System Network +%endif + + +%clean +%__rm -rf %{buildroot} + + %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec index 2bb53f516..ffea0e925 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kmyfirewall %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: iptables based firewall configuration tool for TDE [Trinity] Version: 1.1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -78,7 +73,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -196,18 +191,3 @@ done %{tde_libdir}/libkmfwidgets.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2 -- GCC 4.7 fixes. [Commit #88d2d2a7] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index 0a169c4c1..da0e97e3f 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -1,57 +1,89 @@ -# Default version for this component -%define tde_pkg kmymoney -%define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +%if 0%{?fedora} >= 23 +%define _configure_libtool_hardening_hack 0 %endif -# TDE specific building variables +# +# spec file for package kmymoney (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg kmymoney +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: personal finance manager for TDE +# Required for Mageia >= 2: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 -Version: 1.0.5 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Personal finance manager for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kmymoneytitlelabel.png +Source2: %{name}-rpmlintrc -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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +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 + BuildRequires: recode BuildRequires: libofx-devel @@ -78,7 +110,8 @@ BuildRequires: openjade-devel BuildRequires: libtqt3-mt-sqlite3 Requires: libtqt3-mt-sqlite3 -Requires: %{name}-common == %{version}-%{release} +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} + %description KMyMoney is the Personal Finance Manager for TDE. It operates similar to @@ -86,31 +119,78 @@ MS-Money and Quicken, supports different account types, categorisation of expenses, QIF import/export, multiple currencies and initial online banking support. +%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 + +########## %package common Summary: KMyMoney architecture independent files Group: Applications/Utilities -Requires: %{name} == %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %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. +%files common -f kmymoney2.lang +%defattr(-,root,root,-) +%{tde_datadir}/apps/kmymoney2/ +%{tde_datadir}/config.kcfg/kmymoney2.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%dir %{tde_datadir}/icons/Tango/ +%dir %{tde_datadir}/icons/Tango/*/ +%dir %{tde_datadir}/icons/Tango/*/*/ +%{tde_datadir}/icons/Tango/*/*/*.png +%{tde_datadir}/icons/Tango/scalable/*.svgz +%{tde_datadir}/icons/locolor/*/*/*.png +%dir %{tde_datadir}/icons/oxygen/ +%dir %{tde_datadir}/icons/oxygen/*/ +%dir %{tde_datadir}/icons/oxygen/*/*/ +%{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/ +%{tde_datadir}/services/kmm_ofximport.desktop + +########## %package devel Summary: KMyMoney development files Group: Development/Libraries -Requires: %{name} == %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains development files needed for KMyMoney plugins. +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/kmymoney/ +%{tde_libdir}/libkmm_kdchart.la +%{tde_libdir}/libkmm_mymoney.la +%{tde_libdir}/libkmm_plugin.la +%{tde_libdir}/*.so +%{_libdir}/tqt3/plugins/designer/libkmymoney.so + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -118,7 +198,7 @@ This package contains development files needed for KMyMoney plugins. %__install -m644 %{SOURCE1} kmymoney2/widgets/ %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -161,6 +241,7 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po %__make %{?_smp_mflags} + %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} @@ -168,71 +249,12 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang kmymoney2 +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" + %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 -%{_libdir}/tqt3/plugins/designer/libkmymoney.so - - %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec index acb5a1905..ce17fff0b 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec @@ -15,11 +15,6 @@ %define qt3pluginsdir /usr/lib/qt3/plugins %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Summary: personal finance manager for TDE Version: 1.0.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -141,7 +136,7 @@ This package contains development files needed for KMyMoney plugins. %__install -m644 %{SOURCE1} kmymoney2/widgets/ %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -271,24 +266,3 @@ done %{qt3pluginsdir}/designer/libkmymoney.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 -- Rebuild for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] - -* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 -- Updates to upstream 1.0.5 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff new file mode 100644 index 000000000..9f6f46ba8 --- /dev/null +++ b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff @@ -0,0 +1,11 @@ +--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200 ++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200 +@@ -123,7 +123,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/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch new file mode 100644 index 000000000..8a6754fb5 --- /dev/null +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch @@ -0,0 +1,41 @@ +--- kmymoney/kmymoney2/widgets/Makefile.am.ORI 2012-08-05 18:38:59.001977368 +0200 ++++ kmymoney/kmymoney2/widgets/Makefile.am 2012-08-05 18:39:47.007986865 +0200 +@@ -68,19 +68,19 @@ + # Hence the quick hack to include the required objects from the + # libkmm_mymoney.so directly into libkmymoney.so + libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER +-libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ++libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) + + if INSTALL_QTDESIGNER_SUPPORT + install-exec-local: libkmymoney.la +- $(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer +- $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer ++ $(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer ++ $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/designer + $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR) + for file in $(WIDGET_PNGS); do \ + $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \ + done + + uninstall-local: +- -rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so ++ -rm $(DESTDIR)${QTPLUGINS}/designer/libkmymoney.so + for file in $(WIDGET_PNGS); do \ + rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \ + done +--- kmymoney/admin/acinclude.m4.ORI 2012-08-05 19:47:47.819789267 +0200 ++++ kmymoney/admin/acinclude.m4.in 2012-08-05 19:48:35.842776216 +0200 +@@ -6724,7 +6724,11 @@ + QTDIR=`dirname $MOC` + QTDIR=${QTDIR%/bin} + fi +- LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so ++ if test x$QTPLUGINS = x; then ++ LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so ++ else ++ LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so ++ fi + + # do the checks + if test $enable_sqlite3 = auto; then diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..c80007000 --- /dev/null +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch @@ -0,0 +1,18 @@ +--- kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro.ORI 2012-08-05 18:51:56.961702141 +0200 ++++ kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro 2012-08-05 19:05:43.064116419 +0200 +@@ -4,13 +4,13 @@ + # Target is una libreria: qsqlite3 + + INSTALLS += target +-target.path = $QTDIR/plugins/sqldrivers ++target.path = $(qt_plugins)/sqldrivers + HEADERS += qsql_sqlite3.h \ + qsqlcachedresult.h + SOURCES += smain.cpp \ + qsql_sqlite3.cpp \ + qsqlcachedresult.cpp +-LIBS += -lsqlite3 ++LIBS += -lsqlite3 -L$(QTLIB) + TARGET = qsqlite3 + DESTDIR = ../sqldrivers + CONFIG += release \ diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch new file mode 100644 index 000000000..87e022f0f --- /dev/null +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch @@ -0,0 +1,19 @@ +--- ./kmymoney2/widgets/Makefile.am.ftbfs 2013-06-06 19:37:02.000000000 +0200 ++++ ./kmymoney2/widgets/Makefile.am 2013-07-28 18:58:51.406093917 +0200 +@@ -7,14 +7,14 @@ + libwidgets_a_METASOURCES = AUTO + + libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \ +-transactionsortoption.cpp transactionsortoption.ui \ ++transactionsortoption.ui \ + selectedtransaction.cpp + + #libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \ + #register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \ + #transactionsortoption.ui + +-EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui ++EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui + + # include the widgets that are available to 3rd party sw (e.g. plugins or + # Qt designer) here diff --git a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc b/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec index ad3228a19..8ccd55fda 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo-14.0.0.spec @@ -1,56 +1,91 @@ -# Default version for this component -%define tde_pkg knemo +# +# spec file for package knemo (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knemo +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Network interfaces monitor for the Trinity systray +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ +#URL: http://beta.smileaf.org/projects -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 0.4.8 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + BuildRequires: gettext -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?suse_version} || 0%{?mgaversion} BuildRequires: net-tools +Requires: net-tools +%endif + +%if 0%{?suse_version} > 1320 +BuildRequires: net-tools-deprecated +Requires: net-tools-deprecated %endif @@ -65,25 +100,26 @@ ifconfig, route and iwconfig tools. Homepage: http://extragear.kde.org/apps/knemo/ +########## - -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + %configure \ --prefix=%{tde_prefix} \ @@ -110,21 +146,11 @@ 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 @@ -132,7 +158,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %{tde_tdelibdir}/kded_knemod.la %{tde_tdelibdir}/kded_knemod.so %{tde_tdeappdir}/kcm_knemo.desktop -%{tde_datadir}/apps/knemo/eventsrc +%{tde_datadir}/apps/knemo/ %{tde_datadir}/icons/crystalsvg/*/*/*.png %{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo %{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo @@ -141,5 +167,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec index cbad92895..efdd7ccfc 100644 --- a/redhat/applications/knemo/knemo-3.5.13.2.spec +++ b/redhat/applications/knemo/knemo-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knemo %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: network interfaces monitor for the Trinity systray Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -76,7 +71,7 @@ Homepage: http://extragear.kde.org/apps/knemo/ %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -139,17 +134,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2 -- Rebuild for Fedora 17 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knetload/knetload-14.0.0.spec b/redhat/applications/knetload/knetload-14.0.0.spec index bfbc9d10c..b64c8eb59 100644 --- a/redhat/applications/knetload/knetload-14.0.0.spec +++ b/redhat/applications/knetload/knetload-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg knetload +# +# spec file for package knetload (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knetload +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: a network meter for Kicker [Trinity] -Version: 2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A network meter for Kicker [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KNetLoad is a small network meter for Kicker (the TDE panel). It shows @@ -60,16 +87,20 @@ styles. KNetLoad can monitor just about any network device. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -105,36 +136,31 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file %{tde_pkg} System Monitor +%endif + +# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. +%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/" +pushd "%{?buildroot}%{tde_datadir}/icons" +for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png hicolor/"$i"x"$i"/apps/knetload.png ;done +popd %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/hicolor/*/apps/knetload.png %{tde_datadir}/icons/locolor/*/apps/knetload.png %{tde_tdedocdir}/HTML/en/knetload/ + %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec index 99fd0807b..f61799be5 100644 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ b/redhat/applications/knetload/knetload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetload %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: a network meter for Kicker [Trinity] Version: 2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -69,7 +64,7 @@ KNetLoad can monitor just about any network device. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -135,17 +130,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2 -- Rebuild for Fedora 17 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knetstats/knetstats-14.0.0.spec b/redhat/applications/knetstats/knetstats-14.0.0.spec index 69519453d..cf71c5928 100644 --- a/redhat/applications/knetstats/knetstats-14.0.0.spec +++ b/redhat/applications/knetstats/knetstats-14.0.0.spec @@ -1,70 +1,101 @@ -# Default version for this component -%define tde_pkg knetstats +# +# spec file for package knetstats (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knetstats +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Network interfaces monitor for the Trinity systray +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 1.6.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,23 +131,16 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file %{tde_pkg} System Monitor +%endif %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 @@ -127,5 +151,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec index af57bf9ca..d38b4db5c 100644 --- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec +++ b/redhat/applications/knetstats/knetstats-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetstats %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: network interfaces monitor for the Trinity systray Version: 1.6.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -64,7 +59,7 @@ network interface on a system tray icon %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -126,14 +121,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.1-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec index 4c47066f7..f1434e905 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec @@ -1,47 +1,81 @@ -# Default version for this component -%define tde_pkg knetworkmanager8 +# +# spec file for package knetworkmanager8 (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knetworkmanager +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity applet for Network Manager +Group: Applications/Internet +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Version: 0.8 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Summary: Trinity applet for Network Manager +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Group: Applications/Internet -License: GPLv2+ -URL: http://en.opensuse.org/Projects/KNetworkManager +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: knetworkmanager-3.5.13-missing_includes.patch +BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 +BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool -#Requires: kde-filesystem -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 %if 0%{?rhel} || 0%{?fedora} Requires: NetworkManager-gnome @@ -49,10 +83,12 @@ Requires: NetworkManager-gnome Requires: networkmanager %endif -BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 +# NetworkManager support BuildRequires: NetworkManager-glib-devel +# HAL support +BuildRequires: hal-devel + Obsoletes: trinity-knetworkmanager < %{version}-%{release} Provides: trinity-knetworkmanager = %{version}-%{release} @@ -60,6 +96,25 @@ Provides: trinity-knetworkmanager = %{version}-%{release} KNetworkManager is a system tray applet for controlling network connections on systems that use the NetworkManager daemon. +%files -f knetworkmanager.lang +%defattr(-,root,root,-) +%{tde_bindir}/knetworkmanager +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{tde_tdelibdir}/knetworkmanager_openvpn.so.* +%{tde_tdelibdir}/knetworkmanager_pptp.so.* +%{tde_tdelibdir}/knetworkmanager_vpnc.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 +%{tde_datadir}/services/knetworkmanager_openvpn.desktop +%{tde_datadir}/services/knetworkmanager_pptp.desktop +%{tde_datadir}/services/knetworkmanager_vpnc.desktop + +########## %package devel Summary: Common data shared among the MySQL GUI Suites @@ -72,24 +127,32 @@ Provides: trinity-knetworkmanager-devel = %{version}-%{release} %description devel Development headers for knetworkmanager +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_tdelibdir}/*.la +%{tde_tdelibdir}/*.so + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}8-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -113,59 +176,18 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --with-vpnc \ --with-pptp -%__make %{?_smp_mflags} || %__make +# Does not support parallel build +%__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=%{?buildroot} -C build +%__make install DESTDIR=%{?buildroot} +%find_lang knetworkmanager %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 -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec index 77bc5600c..0ada2aed4 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetworkmanager8 %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 0.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: Trinity applet for Network Manager @@ -182,17 +177,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/*.so %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 -- Rebuild for Fedora 17 - -* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 -- Remove faulty patch for WPA authentication - -* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 -- Initial release diff --git a/redhat/applications/knights/knights-14.0.0.spec b/redhat/applications/knights/knights-14.0.0.spec index ce05ede7c..a5bfff2ce 100644 --- a/redhat/applications/knights/knights-14.0.0.spec +++ b/redhat/applications/knights/knights-14.0.0.spec @@ -1,54 +1,82 @@ -# Default version for this component -%define tde_pkg knights +# +# spec file for package knights (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knights +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.6 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A chess interface for the K Desktop Environment [Trinity] +Group: Amusements/Games +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: A chess interface for the K Desktop Environment [Trinity] -Version: 0.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# GNUCHESS support Requires: gnuchess %description @@ -66,16 +94,20 @@ Here's a quick list of Knights' key features: * Save your unfinished matches and play them again later. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -116,15 +148,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -136,5 +159,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec index a203605a9..523111ac8 100644 --- a/redhat/applications/knights/knights-3.5.13.2.spec +++ b/redhat/applications/knights/knights-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knights %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A chess interface for the K Desktop Environment [Trinity] Version: 0.6 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Amusements/Games @@ -75,7 +70,7 @@ Here's a quick list of Knights' key features: %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -135,20 +130,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3 -- Rebuild for Fedora 17 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-2 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec index 5f1acaa39..df8bb92f3 100644 --- a/redhat/applications/knmap/knmap-14.0.0.spec +++ b/redhat/applications/knmap/knmap-14.0.0.spec @@ -1,50 +1,86 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package knmap (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg knmap -%define tde_version 14.0.0 - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Version: 2.1 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: An NMAP frontend for TDE +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An NMAP frontend for TDE +Group: Applications/Internet +URL: http://sourceforge.net/projects/knmap/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Group: Applications/Internet -License: GPLv2+ -URL: http://sourceforge.net/projects/knmap/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +# NMAP support Requires: nmap + %description Knmap is a TDE-based interface to the 'nmap' facility. @@ -57,26 +93,29 @@ released on 2003-03-09 and targeted the KDE 2.2 and QT 2.3 environments. Not to mention that it did not cater for the full set of 'nmap' options. Or, perhaps, 'nmap' progressed whilst that version of Knmap languished. - . + http://www.kde-apps.org/content/show.php?content=31108 -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -101,33 +140,27 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT +# 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" -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -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 +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{tde_pkg} TDE System Network +%endif -%postun -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 +%clean +%__rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/knmap -%{tde_datadir}/applnk/Internet/knmap.desktop -%{tde_datadir}/apps/knmap/knmapui.rc -%{tde_datadir}/apps/knmap/nmap_manpage.html -%{tde_datadir}/apps/knmap/nmap_manpage.html.diff +%{tde_tdeappdir}/knmap.desktop +%{tde_datadir}/apps/knmap/ %{tde_tdedocdir}/HTML/en/knmap/ %{tde_datadir}/icons/hicolor/*/apps/knmap.png %{tde_datadir}/icons/hicolor/*/apps/knmapman.png @@ -150,8 +183,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.1-2 -- Initial release for TDE 14.0.0 - -* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 2.1-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/knowit/knowit-14.0.0.spec b/redhat/applications/knowit/knowit-14.0.0.spec index efe714add..ae97cad85 100644 --- a/redhat/applications/knowit/knowit-14.0.0.spec +++ b/redhat/applications/knowit/knowit-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg knowit +# +# spec file for package knowit (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knowit +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.10 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Tool for managing notes [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-%{tde_pkg} -Summary: Tool for managing notes [Trinity] -Version: 0.10 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KnowIt is a tool for managing notes which are organized in @@ -56,23 +83,26 @@ tree-like hierarchy. It is similar to TuxCards, but TDE-based, and requires Trinity. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -105,39 +135,25 @@ export PATH="%{tde_bindir}:${PATH}" %__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop %__rm -r %{buildroot}%{tde_datadir}/applnk - %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility +%endif %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}/apps/knowit/ +%{tde_tdedocdir}/HTML/en/knowit/ %{tde_datadir}/icons/hicolor/*/apps/knowit.png %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec index 4b8dd9f47..00791f091 100644 --- a/redhat/applications/knowit/knowit-3.5.13.2.spec +++ b/redhat/applications/knowit/knowit-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knowit %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Tool for managing notes [Trinity] Version: 0.10 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -65,7 +60,7 @@ but TDE-based, and requires Trinity. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -138,14 +133,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.10-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knutclient/knutclient-14.0.0.spec b/redhat/applications/knutclient/knutclient-14.0.0.spec index e471ba9cb..a6bea6551 100644 --- a/redhat/applications/knutclient/knutclient-14.0.0.spec +++ b/redhat/applications/knutclient/knutclient-14.0.0.spec @@ -1,53 +1,81 @@ -# Default version for this component -%define tde_pkg knutclient +# +# spec file for package knutclient (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg knutclient +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] +Group: Applications/Utilities +URL: http://www.knut.noveradsl.cz/knutclient/ -Name: trinity-%{tde_pkg} -Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.knut.noveradsl.cz/knutclient/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description KNutClient monitors UPS statistics through the NUT (Network UPS Tools, @@ -56,16 +84,23 @@ information, presented in a nice visual format, can be invaluable on stations using an UPS. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix permissions +chmod 644 AUTHORS README TODO COPYING ChangeLog + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,26 +135,17 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -%clean -%__rm -rf %{buildroot} - +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" -%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 +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/knutclient %{tde_datadir}/applnk/Utilities/knutclient.desktop %{tde_datadir}/apps/knutclient/knutclientui.rc @@ -130,5 +156,3 @@ done %{tde_datadir}/icons/locolor/*/apps/*.png %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec index 6be2584e8..016bb891e 100644 --- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec +++ b/redhat/applications/knutclient/knutclient-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knutclient %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -65,7 +60,7 @@ stations using an UPS. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -129,18 +124,3 @@ done %{tde_datadir}/icons/locolor/*/apps/*.png %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.5-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec index 2220b3cc1..479a72b5f 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec @@ -1,27 +1,38 @@ -# Default version for this component -%define tde_pkg koffice-i18n +# +# spec file for package koffice-i18n (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg koffice-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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} # Builds all supported languages (not unsupported ones) %if "%{?TDE_LANGS}" == "" @@ -29,22 +40,26 @@ %endif -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Koffice [Trinity] -Version: 1.6.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Internationalization support for Koffice [Trinity] +Group: User Interface/Desktops +URL: http://www.trinitydesktop.org/ -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch # Speed build options %define debug_package %{nil} @@ -53,15 +68,26 @@ 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 +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 + %description %{summary}. @@ -548,7 +574,7 @@ Provides: %{name}-tz_TW = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %build @@ -649,6 +675,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/ca/* %{tde_tdedocdir}/HTML/ca/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/ca.xml %endif @@ -656,6 +684,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %files Czech %defattr(-,root,root,-) %{tde_datadir}/locale/cs/* +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/cs.xml %endif @@ -677,6 +707,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/de/* %{tde_tdedocdir}/HTML/de/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/de.xml %endif @@ -704,6 +736,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/es/* %{tde_tdedocdir}/HTML/es/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/es.xml %endif @@ -743,6 +777,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/fr/* %{tde_tdedocdir}/HTML/fr/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/fr.xml %endif @@ -786,6 +822,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %files Hungarian %defattr(-,root,root,-) %{tde_datadir}/locale/hu/* +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/hu.xml %endif @@ -806,6 +844,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/it/* %{tde_tdedocdir}/HTML/it/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/it.xml %endif @@ -848,6 +888,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" %files Latvian %defattr(-,root,root,-) +%{tde_datadir}/locale/lv %{tde_datadir}/locale/lv/* %endif @@ -956,6 +997,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %defattr(-,root,root,-) %{tde_datadir}/locale/sk/* %{tde_tdedocdir}/HTML/sk/ +%dir %{tde_datadir}/apps/koffice +%dir %{tde_datadir}/apps/koffice/autocorrect %{tde_datadir}/apps/koffice/autocorrect/sk.xml %endif @@ -1047,5 +1090,3 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5 -- Initial release for TDE 14.0.0 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 index 8d27104f1..88a4619fb 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg koffice-i18n %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -32,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: Internationalization support for Koffice [Trinity] Version: 1.6.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -548,7 +543,7 @@ Provides: %{name}-tz_TW = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %build @@ -1048,15 +1043,3 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1 -- Initial release for TDE 3.5.13 - diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 6803cf68a..ce0cec112 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -1,31 +1,39 @@ -# Default version for this component -%define tde_pkg koffice +# +# spec file for package koffice (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg koffice +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%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 @@ -37,34 +45,55 @@ # 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/') +# Required for Mageia 2: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 -Name: trinity-%{tde_pkg} -Summary: An integrated office suite -Version: 1.6.3 -Release: %{?!preversion:10}%{?preversion:9_%{preversion}}%{?dist}%{?_variant} -Group: Applications/Productivity -License: GPLv2+ +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.6.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An integrated office suite +Group: Applications/Productivity +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> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-koffice-rpmlintrc # 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-libpoppler-tqt-devel >= %{tde_version} -BuildRequires: automake libtool + +BuildRequires: autoconf automake libtool m4 +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 + BuildRequires: fontconfig-devel BuildRequires: libart_lgpl-devel BuildRequires: libtiff-devel @@ -84,19 +113,34 @@ BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: readline-devel +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + +# LCMS2 support +%if 0%{?suse_version} +BuildRequires: liblcms2-devel +%endif + +# BZIP2 support %if 0%{?suse_version} BuildRequires: libbz2-devel -BuildRequires: liblcms-devel %else BuildRequires: bzip2-devel -BuildRequires: lcms-devel +%endif +# PAPER support BuildRequires: libpaper-devel -%endif # RUBY support %if 0%{?with_ruby} BuildRequires: ruby ruby-devel >= 1.8.1 +%if 0%{?fedora} >= 19 +BuildRequires: rubypick +%endif %endif # FREETYPE support @@ -135,17 +179,38 @@ BuildRequires: utempter-devel %if 0%{?rhel} == 4 BuildRequires: utempter %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}utempter-devel +%endif +%if 0%{?fedora} || 0%{?rhel} >= 5 BuildRequires: libutempter-devel %endif +# POPPLER support +%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libpoppler-devel >= 0.12 +%else +BuildRequires: poppler-devel >= 0.12 +%endif +%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 +%endif + # POSTGRESQL support # Requires 'libpqxx', for kexi-driver-pgqsl %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 %define with_postgresql 1 BuildRequires: postgresql-devel BuildRequires: libpqxx-devel %endif +%endif Obsoletes: trinity-libpqxx # WPD support @@ -177,7 +242,7 @@ BuildRequires: Mesa-libGLU-devel # OPENJPEG %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}openjpeg-devel +#BuildRequires: %{_lib}openjpeg-devel %endif # LIBXI support @@ -194,6 +259,13 @@ BuildRequires: libXi6-devel BuildRequires: libXi-devel %endif +# SQLITE support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif + %description KOffice is an integrated office suite. @@ -203,23 +275,22 @@ 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} +Obsoletes: %{name} <= %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: %{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release} %description suite KOffice is an integrated office suite. @@ -232,31 +303,12 @@ KOffice is an integrated office suite. %package core Summary: Core support files for %{name} Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{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 @@ -310,7 +362,7 @@ fi %{tde_datadir}/servicetypes/kwmailmerge.desktop %{tde_datadir}/servicetypes/widgetfactory.desktop %{tde_tdeappdir}/*koffice.desktop -%{tde_datadir}/applnk/Office/KThesaurus.desktop +%{tde_tdeappdir}/KThesaurus.desktop %{tde_tdeappdir}/*koshell.desktop %{tde_datadir}/apps/kofficewidgets/ %if 0%{?with_kross} @@ -327,7 +379,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs @@ -357,18 +409,12 @@ License: LGPLv2+ %{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} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} License: LGPLv2+ %description devel @@ -388,20 +434,11 @@ License: LGPLv2+ %package kword Summary: A frame-based word processor capable of professional standard documents Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{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/ @@ -422,7 +459,7 @@ update-desktop-database -q &> /dev/null ||: %package kspread Summary: A powerful spreadsheet application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kspread %{summary}. @@ -459,20 +496,11 @@ Requires: %{name}-core = %{version}-%{release} %package kpresenter Summary: A full-featured presentation program Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{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/ @@ -493,7 +521,7 @@ update-desktop-database -q &> /dev/null ||: %package kivio Summary: A flowcharting application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kivio < %{version}-%{release} %description kivio @@ -517,22 +545,17 @@ Obsoletes: kivio < %{version}-%{release} %package karbon Summary: A vector drawing application Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{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}/libtdeinit_karbon.so +%exclude %{tde_tdelibdir}/libkarbonepsimport.* %{tde_tdelibdir}/*karbon*.* %{tde_tdelibdir}/libwmfexport.* %{tde_tdelibdir}/libwmfimport.* @@ -548,20 +571,11 @@ Requires: %{name}-core = %{version}-%{release} %package kugar Summary: A tool for generating business quality reports Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{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/ @@ -586,7 +600,7 @@ update-desktop-database -q &> /dev/null ||: %package kexi Summary: An integrated environment for managing data Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_postgresql} == 0 Obsoletes: %{name}-kexi-driver-pgsql @@ -596,15 +610,6 @@ Obsoletes: %{name}-kexi-driver-pgsql %{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/ @@ -620,13 +625,13 @@ update-desktop-database -q &> /dev/null ||: %{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_confdir}/kexirc +%{tde_confdir}/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_datadir}/services/kformdesigner/ %{tde_tdeappdir}/*kexi.desktop %{tde_datadir}/services/kexidb_sqlite*driver.desktop %if 0%{?with_kross} @@ -634,13 +639,14 @@ update-desktop-database -q &> /dev/null ||: %{tde_tdelibdir}/krosskexiapp.* %{tde_tdelibdir}/krosskexidb.* %endif +%{tde_confdir}/magic/kexi.magic.mgc ########## %package kexi-driver-mysql Summary: Mysql-driver for kexi Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} %description kexi-driver-mysql %{summary}. @@ -659,7 +665,7 @@ Requires: %{name}-kexi = %{version}-%{release} %package kexi-driver-pgsql Summary: Postgresql driver for kexi Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} +Requires: %{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release} %description kexi-driver-pgsql %{summary}. @@ -678,20 +684,11 @@ Requires: %{name}-kexi = %{version}-%{release} %package kchart Summary: An integrated graph and chart drawing tool Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{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/ @@ -708,7 +705,7 @@ update-desktop-database -q &> /dev/null ||: %package kformula Summary: A powerful formula editor Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?mgaversion} || 0%{?mdkversion} Requires: fonts-ttf-dejavu @@ -719,7 +716,6 @@ 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 @@ -747,17 +743,11 @@ Requires: dejavu %package filters Summary: Import and Export Filters for KOffice Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description filters %{summary}. -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - %files filters %defattr(-,root,root,-) %{tde_libdir}/libkwordexportfilters.so.* @@ -817,7 +807,7 @@ Requires: %{name}-core = %{version}-%{release} %package kplato Summary: An integrated project management and planning tool Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %description kplato %{summary}. @@ -838,9 +828,9 @@ Requires: %{name}-core = %{version}-%{release} %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 +Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release} %description chalk Chalk is a painting and image editing application for KOffice. Chalk contains @@ -848,15 +838,6 @@ 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 @@ -1043,17 +1024,15 @@ This package is part of the TDE Office Suite. %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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1063,7 +1042,7 @@ This package is part of the TDE Office Suite. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -1071,12 +1050,19 @@ This package is part of the TDE Office Suite. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +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" %endif +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "kexi/migration/keximigratetest.cpp" \ + -e "/TDEApplication/ s|\");|\", true, true, true);|" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -1108,6 +1094,39 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/" +#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do +# mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/; +#done + +# Fix desktop icon location +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kudesigner Office FlowChart +%suse_update_desktop_file kivio Office FlowChart +%suse_update_desktop_file kchart Office FlowChart +%suse_update_desktop_file kexi Office Database +%suse_update_desktop_file -r chalk Graphics RasterGraphics +%suse_update_desktop_file -r karbon Graphics VectorGraphics +%suse_update_desktop_file kpresenter Office Presentation +%suse_update_desktop_file kspread Office Spreadsheet +%suse_update_desktop_file -u KThesaurus Office +%suse_update_desktop_file -r kformula Science Math +%suse_update_desktop_file kword Office WordProcessor +%suse_update_desktop_file koshell Office Core-Office +%suse_update_desktop_file kplato Office ProjectManagement +%endif + +# Apps that should stay in TDE +for i in kivio kplato; do + echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop" +done + +# Links duplicate files +%fdupes %{buildroot} + ## unpackaged files # fonts rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ @@ -1115,20 +1134,6 @@ rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ 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 @@ -1136,5 +1141,3 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-10 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec index 34dfb6606..b620d022d 100644 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/koffice-3.5.13.2.spec @@ -5,11 +5,6 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %define _disable_ld_no_undefined 1 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Summary: An integrated office suite Version: 1.6.3 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist} Group: Applications/Productivity License: GPLv2+ @@ -55,10 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch -Patch2: koffice-3.5.13.2-fix_ruby2_detection.patch -Patch3: admin-fix-parallel-test.diff - # BuildRequires: world-devel ;) BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -328,7 +319,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs @@ -1062,9 +1053,6 @@ This package is part of the TDE Office Suite. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ruby2 -%patch3 -p1 -b .automake113 # use LGC variant instead %__sed -i.dejavu-lgc \ @@ -1073,7 +1061,7 @@ This package is part of the TDE Office Suite. lib/kformula/{contextstyle,fontstyle,symboltable}.cc %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -1167,38 +1155,3 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-9 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.3-7 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5 -- Fix kformula dependancies (for RHEL6) -- Fix FTBFS due to missing libraries [Bug #657] [Commit #5c69fcd3] - Clean up lib paths in LDFLAGS - moved to LIBADD - For KWord and and KPresenter added linking kspell2 - For KSpread added linking kutils -- Fix accidental conversions of binary files [Bug #1033] [Commit #dbe89307] - -* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-4 -- Updates BuildRequires -- Build for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] -- Fix compilation with Ruby 1.9 [Bug #735] -- Fix compilation with libpng [Bug #603] - -* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-3 -- Fix GraphicksMagick 1.3 support [Bug #353] -- Various patches for kexi [Bug #777] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2 -- Fix HTML directory location - -* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn' -- Removed 'krita', added 'chalk' diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/koffice/trinity-koffice-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/koffice/trinity-koffice-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/konversation/konversation-14.0.0.spec b/redhat/applications/konversation/konversation-14.0.0.spec index d84e1d2f2..85b561331 100644 --- a/redhat/applications/konversation/konversation-14.0.0.spec +++ b/redhat/applications/konversation/konversation-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg konversation +# +# spec file for package konversation (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg konversation +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: User friendly Internet Relay Chat (IRC) client for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] -Version: 1.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + +# XSLT support BuildRequires: libxslt-devel %if 0%{?suse_version} BuildRequires: docbook-xsl-stylesheets @@ -56,6 +83,7 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-style-xsl %endif +# LIBXI support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}xi-devel %endif @@ -85,17 +113,20 @@ and experienced users alike will appreciate its many features: * DCC file transfer with resume support +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -135,15 +166,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -178,5 +200,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec index 8043497d9..98f1f0472 100644 --- a/redhat/applications/konversation/konversation-3.5.13.2.spec +++ b/redhat/applications/konversation/konversation-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg konversation %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -95,7 +90,7 @@ and experienced users alike will appreciate its many features: %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -177,24 +172,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.1-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-3 -- Initial release for TDE 3.5.13.1 - -* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location -- Rename old tq methods that no longer need a unique name [Commit #01f5ea83] -- Remove additional unneeded tq method conversions [Commit #efdae4e7] -- Rename obsolete tq methods to standard names [Commit #c64099e5] -- Fix linear alphabet string errors [Commit #440010aa] -- Fix inadvertent "TQ" changes. [Commit #ca3d6cef] - -* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec new file mode 100644 index 000000000..5d0635d9f --- /dev/null +++ b/redhat/applications/kooldock/kooldock.spec @@ -0,0 +1,186 @@ +# +# spec file for package kooldock (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.1 +%endif +%define tde_pkg kooldock +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.7 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Dock for TDE with cool visual enhancements +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +KoolDock is a fork of the original work of Dang Viet Dung,. +KSmoothDock 2.1. KoolDock is a dock for TDE with cool. +visual enhancements and effects. + +Some of it features are: +* Display quick launchers to your favourite apps +* A builtin task bar +* Pager and clock. (Not done yet) +* Smooth zooming effect (like Apple's OS X dock) +* Transparent Background + +Homepage: http://sourceforge.net/projects/kooldock/ + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export kde_confdir="%{tde_confdir}" + +# Warning: --enable-final causes FTBFS +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO +%{tde_bindir}/kooldock +%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/default/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/default/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/default/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-right.png +%{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png +%{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png +%{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png +%{tde_datadir}/apps/kooldock/icons/crystalsvg/128x128/apps/kooldock.png +%{tde_datadir}/apps/kooldock/icons/crystalsvg/16x16/apps/kooldock.png +%{tde_datadir}/apps/kooldock/icons/crystalsvg/32x32/apps/kooldock.png +%{tde_datadir}/apps/kooldock/icons/crystalsvg/64x64/apps/kooldock.png +%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png +%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png + + +%changelog diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec index 854bd79c9..602ab32c3 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec @@ -1,81 +1,111 @@ -# Default version for this component -%define tde_pkg kopete-otr +# +# spec file for package kopete-otr (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# Under Mageia 3, we require "libotr3" package - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kopete-otr +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +# Required for Mageia 6: removes the ldflag '--no-undefined' +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +%define _disable_ld_no_undefined 1 +%endif -License: GPLv2+ -Group: Applications/Utilities +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.7 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Off-The-Record encryption for Kopete [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 tdenetwork Requires: trinity-kopete >= %{tde_version} +BuildRequires: autoconf automake libtool m4 +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 + # OTR support BuildRequires: libotr-devel + %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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -118,17 +148,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -148,5 +167,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6 -- Initial release for TDE 14.0.0 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 index 3cdc837e8..6b1eee75b 100644 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec +++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec @@ -9,11 +9,6 @@ # Under Mageia 3, we require "libotr3" package -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -34,7 +29,7 @@ Name: trinity-%{tde_pkg} Summary: Off-The-Record encryption for Kopete [Trinity] Version: 0.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -79,7 +74,7 @@ users with IM-Cients supporting the OTR encryption method. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -154,18 +149,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2 -- Rebuild for Fedora 17 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec index 353c86aac..deac7442b 100644 --- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec +++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg kpicosim +# +# spec file for package kpicosim (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kpicosim +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.6a +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-%{tde_pkg} -Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] -Version: 0.6a -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description kpicosim is a development environment for the Xilinx @@ -57,23 +84,26 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -107,15 +137,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -128,5 +149,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec index 2dc0c7831..284de9ad5 100644 --- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec +++ b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpicosim %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] Version: 0.6a -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -66,7 +61,7 @@ simulator and export functions to VHDL, HEX and MEM files. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -127,14 +122,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index dfdca669f..c63417e81 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -1,63 +1,95 @@ -# Default version for this component -%define tde_pkg kpilot +# +# spec file for package kpilot (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kpilot +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: TDE Palm Pilot hot-sync tool -Version: 0.7 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.7 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE Palm Pilot hot-sync tool +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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-tdepim-devel >= %{tde_version} +BuildRequires: gettext + +BuildRequires: autoconf automake libtool m4 +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 # FLEX -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?rhel} +%if 0%{?suse_version} || 0%{?mgaversion} +BuildRequires: flex +%endif +%if 0%{?rhel} || 0%{?fedora} BuildRequires: flex -%else BuildRequires: flex-devel %endif -BuildRequires: gettext +# PILOT support 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 @@ -66,16 +98,20 @@ 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%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -111,6 +147,13 @@ export PATH="%{tde_bindir}:${PATH}" # Unwanted files %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so +%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kpilot.desktop Utility PDA SyncUtility X-KDE-Utilities-Peripherals +%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop Utility PDA X-TDE-Utilities-File +%endif @@ -118,29 +161,11 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -169,7 +194,7 @@ done %{tde_tdeappdir}/kpalmdoc.desktop %{tde_tdeappdir}/kpilot.desktop %{tde_tdeappdir}/kpilotdaemon.desktop -%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui +%{tde_datadir}/apps/kaddressbook/contacteditorpages/ %{tde_datadir}/apps/tdeconf_update/kpalmdoc.upd %{tde_datadir}/apps/tdeconf_update/kpilot.upd %{tde_datadir}/apps/kpilot @@ -182,5 +207,3 @@ done %{tde_tdedocdir}/HTML/en/kpilot/ %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec index 195957800..4bfb1a46e 100644 --- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec +++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpilot %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE Palm Pilot hot-sync tool Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -69,7 +64,7 @@ and synchronize the built-in applications with their TDE counterparts. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -176,20 +171,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2 -- Rebuild for Fedora 17 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc b/redhat/applications/kpilot/trinity-kpilot-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/applications/kpilot/trinity-kpilot-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec new file mode 100644 index 000000000..ed6be1be0 --- /dev/null +++ b/redhat/applications/kplayer/kplayer.spec @@ -0,0 +1,179 @@ +# +# spec file for package kplayer (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg kplayer +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.6.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: KPlayer is a TDE multimedia player +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +Requires: mplayer + + +%description +KPlayer is a TDE multimedia player. +With KPlayer you can easily play a wide variety of video and audio files and +streams using a rich and friendly interface that follows KDE standards. +This version was derived from the KDE3 branch 0.6.3 for the Trinity Desktop Environment + +Features include + +video, audio and subtitle playback from file, URL, DVD, VCD, audio CD, TV, DVB, and KDE I/O Slaves; +volume, contrast, brightness, hue and saturation controls; +zooming, full screen and fixed aspect options; +status and progress display and seeking; +multimedia library to organize your media files and streams; +configuration dialog; +file properties for setting file specific options. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +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 \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%{tde_bindir}/kplayer +%{tde_datadir}/apps/kplayer/ +%{tde_datadir}/icons/hicolor/*/apps/kplayer.png +%{tde_datadir}/icons/locolor/*/apps/kplayer.png +%{tde_datadir}/services/kplayerpart.desktop +%{tde_tdelibdir}/libkplayerpart.la +%{tde_tdelibdir}/libkplayerpart.so +%{tde_tdeappdir}/kplayer.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kplayer-actions.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kplayer-directory.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kplayer-next.desktop +%{tde_datadir}/apps/konqueror/servicemenus/kplayer-play-queue.desktop +%lang(da) %{tde_tdedocdir}/HTML/da/kplayer/ +%lang(en) %{tde_tdedocdir}/HTML/en/kplayer/ +%lang(es) %{tde_tdedocdir}/HTML/es/kplayer/ +%lang(it) %{tde_tdedocdir}/HTML/it/kplayer/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/kplayer/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/kplayer/ + + +%post + + +%postun + + +%changelog diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave-14.0.0.spec index e3a7459e4..2bb9fe60a 100644 --- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec +++ b/redhat/applications/kpowersave/kpowersave-14.0.0.spec @@ -1,56 +1,111 @@ -# Default version for this component -%define tde_pkg kpowersave +# +# spec file for package kpowersave (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kpowersave +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Version: 0.7.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -Summary: HAL based power management applet for Trinityfiles or directories. +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.7.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: HAL based power management applet for Trinityfiles or directories. +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 +BuildRequires: cmake libtool +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 + +# XSCREENSAVER support +# 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} +%define with_xscreensaver 1 + +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extras +%if 0%{?fedora} +BuildRequires: xscreensaver-extras-base +%endif +BuildRequires: xscreensaver-gl-base +BuildRequires: xscreensaver-gl-extras +%endif + +%if 0%{?suse_version} +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra +%endif + +%endif + %description KPowersave is a TDE systray applet which allows to control the power @@ -83,10 +138,14 @@ settings for: * notification settings -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -131,19 +190,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -160,5 +206,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config/kpowersaverc %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec index 2493a4b50..9abc1468c 100644 --- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec +++ b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kpowersave %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Version: 0.7.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: HAL based power management applet for Trinityfiles or directories. License: GPLv2+ @@ -161,18 +156,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config/kpowersaverc %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3 -- Initial release for TDE 3.5.13.1 - -* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2 -- Add missing /sbin/ldconfig -- Add missing doc file - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes-14.0.0.spec index 43af9cd92..b04652b96 100644 --- a/redhat/applications/krecipes/krecipes-14.0.0.spec +++ b/redhat/applications/krecipes/krecipes-14.0.0.spec @@ -1,8 +1,26 @@ -# Default version for this component -%define tde_pkg krecipes +# +# spec file for package krecipes (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# # TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif +%define tde_pkg krecipes %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -14,37 +32,49 @@ %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -Name: trinity-%{tde_pkg} -Summary: Recipes manager for TDE -Version: 1.0beta2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0beta2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Recipes manager for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +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 + # MYSQL support BuildRequires: mysql-devel @@ -54,6 +84,7 @@ BuildRequires: postgresql-devel # SQLITE support BuildRequires: sqlite-devel + %description Krecipes is a TDE application designed to manage recipes. It can help you to do your shopping list, search through your recipes to find what you can do @@ -61,7 +92,9 @@ with available ingredients and a diet helper. It can also import or export recipes from files in various format (eg RecipeML or Meal-Master) or from databases. -%if 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -71,7 +104,7 @@ databases. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -110,29 +143,27 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Fix desktop file location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r krecipes Education Chemistry +%endif -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done +# Removes duplicate files +%fdupes "%{buildroot}%{tde_datadir}" -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/krecipes -%{tde_datadir}/applnk/Utilities/krecipes.desktop +%{tde_tdeappdir}/krecipes.desktop %{tde_datadir}/apps/krecipes/ %{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png %{tde_datadir}/icons/hicolor/*/apps/krecipes.png @@ -147,5 +178,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0beta2-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/krename/krename-14.0.0.spec b/redhat/applications/krename/krename-14.0.0.spec index 560862453..3933f8978 100644 --- a/redhat/applications/krename/krename-14.0.0.spec +++ b/redhat/applications/krename/krename-14.0.0.spec @@ -1,52 +1,80 @@ -# Default version for this component -%define tde_pkg krename +# +# spec file for package krename (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg krename +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 3.0.14 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A TDE batch file renaming utility +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: A TDE batch file renaming utility. -Version: 3.0.14 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or @@ -54,16 +82,20 @@ even more files in one go. The filenames can be created by parts of the original 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -98,25 +130,18 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file krename System FileManager +%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop +%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop +%endif + %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 @@ -131,5 +156,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec index c3e967f63..f5267c587 100644 --- a/redhat/applications/krename/krename-3.5.13.2.spec +++ b/redhat/applications/krename/krename-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg krename %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A TDE batch file renaming utility. Version: 3.0.14 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -63,7 +58,7 @@ or Exif informations of an image. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -130,28 +125,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-7 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.0.14-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-5 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader-14.0.0.spec index b62b79384..260c97e4a 100644 --- a/redhat/applications/krusader/krusader-14.0.0.spec +++ b/redhat/applications/krusader/krusader-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg krusader +# +# spec file for package krusader (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg krusader +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.90.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Twin-panel (commander-style) file manager for TDE (and other desktops) +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: twin-panel (commander-style) file manager for TDE (and other desktops) -Version: 1.90.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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-tdebindings-devel >= %{tde_version} +BuildRequires: autoconf automake libtool m4 +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 + %description Krusader is a simple, easy, powerful, twin-panel (commander-style) file @@ -70,16 +97,20 @@ Almost completely customizable, Krusader is very user friendly, fast and looks great on your desktop. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -115,26 +146,18 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%suse_update_desktop_file krusader System FileManager +%suse_update_desktop_file krusader_root-mode System FileManager +%endif + %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 @@ -158,5 +181,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec index 22728025c..615b95ea4 100644 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ b/redhat/applications/krusader/krusader-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg krusader %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -82,7 +77,7 @@ great on your desktop. %patch0 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -158,19 +153,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.90.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2 -- Rebuild for Fedora 17 -- GCC 4.7 fixes. [Commit #fdf6d340] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope-14.0.0.spec index 8af7b3b83..c684c1e6e 100644 --- a/redhat/applications/kscope/kscope-14.0.0.spec +++ b/redhat/applications/kscope/kscope-14.0.0.spec @@ -1,42 +1,61 @@ -# Default version for this component -%define tde_pkg kscope +# +# spec file for package kscope (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kscope +%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/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} +Epoch: %{tde_epoch} +Version: 1.6.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Source editing environment for TDE +Group: Applications/Internet +URL: http://kscope.sourceforge.net + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Name: trinity-%{tde_pkg} -Version: 1.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: source editing environment for TDE +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Group: Applications/Internet -License: GPLv2+ -URL: http://kscope.sourceforge.net -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 @@ -44,6 +63,25 @@ BuildRequires: desktop-file-utils BuildRequires: gettext Requires: cscope +BuildRequires: autoconf automake libtool m4 +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 + +BuildRequires: flex +BuildRequires: bison + + %description KScope is a TDE front-end to Cscope. It provides a source-editing environment for large C projects. KScope is focused on source editing and analysis. @@ -73,16 +111,20 @@ Main Features: * Works with externally-built cscope.out files -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -116,30 +158,25 @@ export PATH="%{tde_bindir}:${PATH}" %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}" -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -for i in hicolor 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 +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file %{tde_pkg} Development IDE +%endif -%postun -for i in hicolor 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 +%clean +%__rm -rf $RPM_BUILD_ROOT %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/kscope -%{tde_datadir}/applnk/Development/kscope.desktop +%{tde_tdeappdir}/kscope.desktop %{tde_datadir}/apps/kscope/ %{tde_tdedocdir}/HTML/en/kscope/ %{tde_datadir}/icons/hicolor/*/apps/kscope.png @@ -147,5 +184,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.2-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec index f0396bafa..dc9f5bf06 100644 --- a/redhat/applications/ksensors/ksensors-14.0.0.spec +++ b/redhat/applications/ksensors/ksensors-14.0.0.spec @@ -1,48 +1,81 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package ksensors (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg ksensors -%define tde_version 14.0.0 - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-ksensors -Version: 0.7.3 -Release: %{?!preversion:21}%{?preversion:20_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.7.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity Frontend to lm_sensors +Group: Applications/System +URL: http://ksensors.sourceforge.net/ -Summary: Trinity Frontend to lm_sensors -Group: Applications/System -License: GPLv2+ -URL: http://ksensors.sourceforge.net/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -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: autoconf automake libtool m4 +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 + %if 0%{?suse_version} BuildRequires: libsensors4-devel %else @@ -52,22 +85,27 @@ BuildRequires: lm_sensors-devel # 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -99,31 +137,22 @@ export PATH="%{tde_bindir}:${PATH}" %__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 +# 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 +%if 0%{?suse_version} +%suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor +%endif + %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 @@ -131,7 +160,7 @@ done %lang(de) %doc LIESMICH %lang(fr) %doc LISEZMOI %{tde_bindir}/ksensors -%{tde_datadir}/applnk/System/ksensors.desktop +%{tde_tdeappdir}/ksensors.desktop %{tde_datadir}/apps/ksensors/ %{tde_datadir}/autostart/ksensors.desktop %{tde_datadir}/icons/hicolor/*/apps/ksensors.png @@ -141,11 +170,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-21 -- Initial release for TDE 14.0.0 - -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec index 2b14d2946..e1874db69 100644 --- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec +++ b/redhat/applications/ksensors/ksensors-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Default version for this component %define tde_pkg ksensors %define tde_version 3.5.13.2 @@ -24,7 +19,7 @@ Name: trinity-ksensors Version: 0.7.3 -Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist} Summary: Trinity Frontend to lm_sensors Group: Applications/System @@ -67,7 +62,7 @@ temperatures with KSensors. %setup -q -n %{tde_pkg}-%{version} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -142,8 +137,3 @@ done %changelog -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail-14.0.0.spec index 52727c6a1..6fecd9bad 100644 --- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec +++ b/redhat/applications/kshowmail/kshowmail-14.0.0.spec @@ -1,68 +1,106 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package kshowmail (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg kshowmail -%define tde_version 14.0.0 - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Version: 3.3.1 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: Look messages into your mail server. +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 3.3.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Look messages into your mail server +Group: Applications/Internet +URL: http://sourceforge.net/projects/kshowmail/ -Group: Applications/Internet -License: GPLv2+ -URL: http://sourceforge.net/projects/kshowmail/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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-tdepim-devel >= %{tde_version} +BuildRequires: autoconf automake libtool m4 +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 + + %description Very simply kshowmail is a program that allows you to look in on your mail server, see what is waiting, decide if it is legitimate, and delete it right off of the server if it is not. -All without dragging any messages into your computer. +All without dragging any messages into your computer. + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -89,6 +127,19 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %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" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kshowmail Network Email +%endif + %clean %__rm -rf $RPM_BUILD_ROOT @@ -112,18 +163,10 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %{tde_tdelibdir}/kcm_kshowmailconfiglog.so %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.la %{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.so -%{tde_datadir}/applnk/Internet/kshowmail.desktop -%{tde_datadir}/apps/kshowmail/kshowmailui.rc -%{tde_datadir}/apps/kshowmail/pics/eraser.png -%{tde_datadir}/apps/kshowmail/pics/kshowmail.png -%{tde_datadir}/apps/kshowmail/pics/kshowmail24.png -%{tde_datadir}/apps/kshowmail/pics/letter-closed.png -%{tde_datadir}/apps/kshowmail/pics/letter-open.png -%{tde_datadir}/apps/kshowmail/pics/ok.png -%{tde_datadir}/apps/kshowmail/pics/tool.png -%{tde_datadir}/apps/kshowmail/sounds/neuepost.wav -%{tde_datadir}/apps/kshowmail/sounds/newmail.wav +%{tde_tdeappdir}/kshowmail.desktop +%{tde_datadir}/apps/kshowmail/ %{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png +%{tde_datadir}/icons/hicolor/*/apps/kshowmail.png %{tde_datadir}/services/kshowmailconfigaccounts.desktop %{tde_datadir}/services/kshowmailconfigactions.desktop %{tde_datadir}/services/kshowmailconfigdisplay.desktop @@ -142,8 +185,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-2 -- Initial release for TDE 14.0.0 - -* Thu Apr 25 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.1-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/kshutdown/kshutdown-14.0.0.spec b/redhat/applications/kshutdown/kshutdown-14.0.0.spec index 249d51d3b..ad1273b0b 100644 --- a/redhat/applications/kshutdown/kshutdown-14.0.0.spec +++ b/redhat/applications/kshutdown/kshutdown-14.0.0.spec @@ -1,45 +1,80 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package kshutdown (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg kshutdown -%define tde_version 14.0.0 - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Version: 1.0.4 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: An advanced shut down utility for TDE +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An advanced shut down utility for TDE +Group: Applications/Multimedia +URL: http://kde-apps.org/content/show.php?content=41180 -Group: Applications/Multimedia -License: GPLv2+ -URL: http://kde-apps.org/content/show.php?content=41180 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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: autoconf automake libtool m4 +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 + %description It has 4 main commands: @@ -53,16 +88,20 @@ It features time and delay options, command line support, wizard, and sounds. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -96,24 +135,16 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.desktop" +%suse_update_desktop_file %{tde_pkg} Utility DesktopUtility +%endif + %clean %__rm -rf $RPM_BUILD_ROOT -%post -update-desktop-database %{tde_datadir}/applications -q &> /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 -update-desktop-database %{tde_datadir}/applications -q &> /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 - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) @@ -130,7 +161,4 @@ done %lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/ - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec index 009c46c45..a5dc2bef3 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg ksplash-engine-moodin +# +# spec file for package ksplash-engine-moodin (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg ksplash-engine-moodin +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: fading splash screen engine for Trinity -Version: 0.4.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Fading splash screen engine for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description Heavily customizable engine for various types of themes. @@ -68,16 +95,20 @@ engine by Sean Meiners <Sean.Meiners@LinspireInc.com> Homepage: http://moodwrod.com -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -119,11 +150,12 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %{tde_tdelibdir}/ksplashmoodin.la %{tde_tdelibdir}/ksplashmoodin.so +%if "%{?tde_version}" == "14.1.0" +%{tde_datadir}/apps/ksplash/Themes/Architecture/ +%endif %{tde_datadir}/apps/ksplash/Themes/FingerPrint/ %{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ %{tde_datadir}/services/ksplashmoodin.desktop %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-6 -- Initial release for TDE 14.0.0 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 index 207ac815b..a27f7d851 100644 --- 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 @@ -2,11 +2,6 @@ %define tde_pkg ksplash-engine-moodin %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: fading splash screen engine for Trinity Version: 0.4.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -77,7 +72,7 @@ Homepage: http://moodwrod.com %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -124,18 +119,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.2-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2 -- Rebuild for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec index 67d287878..0a12ea867 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec @@ -1,56 +1,100 @@ -# Default version for this component -%define tde_pkg ksquirrel +# +# spec file for package ksquirrel (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg ksquirrel +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Powerful Trinity image viewer +Group: Amusements/Games +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Amusements/Games +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 + +BuildRequires: autoconf automake libtool m4 +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 + +# 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 +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-Mesa-libGLU +%endif + %description KSquirrel is an image viewer for TDE with disk navigator, file tree, @@ -61,22 +105,27 @@ KSquirrel is a fast and convenient image viewer for TDE featuring OpenGL and dynamic format support. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 kde_confdir="%{tde_confdir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -115,17 +164,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -135,20 +173,23 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/libksquirrelpart.la %{tde_tdelibdir}/libksquirrelpart.so %{tde_tdeappdir}/ksquirrel.desktop +%dir %{tde_datadir}/apps/dolphin +%dir %{tde_datadir}/apps/dolphin/servicemenus %{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_datadir}/apps/ksquirrelpart/ +%{tde_confdir}/magic/x-ras.magic +%{tde_confdir}/magic/x-sun.magic +%{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_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo %{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 + %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec index 733644295..d9b8d3d35 100644 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec +++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ksquirrel %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Powerful Trinity image viewer Version: 0.8.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Amusements/Games @@ -70,7 +65,7 @@ OpenGL and dynamic format support. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -149,18 +144,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_mandir}/man1/ksquirrel.1 %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index c32baae1b..5eea800eb 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -1,54 +1,86 @@ -# Default version for this component -%define tde_pkg kstreamripper -%define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package kstreamripper (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/ +# + +%if 0%{?fedora} >= 28 +%global debug_package %{nil} %endif -# TDE specific building variables +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg kstreamripper +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE frontend for streamripper -Version: 0.3.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE frontend for streamripper +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + BuildRequires: scons +BuildRequires: python %description @@ -58,13 +90,18 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%__rm -f kde.py %build @@ -72,13 +109,22 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export QTDIR=/usr -scons -Q -j4 +python2 /usr/bin/scons configure prefix="%{_prefix}" +python2 /usr/bin/scons %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +DESTDIR="%{?buildroot}" python2 /usr/bin/scons install + +# Missing icon file will make this fail. +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kstreamripper Audio Recorder +%endif %clean @@ -88,12 +134,9 @@ export PATH="%{tde_bindir}:${PATH}" %files %defattr(-,root,root,-) %{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc +%{tde_tdeappdir}/kstreamripper.desktop +%{tde_datadir}/apps/kstreamripper/ %{tde_tdedocdir}/HTML/en/kstreamripper/ - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec index 03a9332dc..215f398d3 100644 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kstreamripper %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: TDE frontend for streamripper Version: 0.3.4 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -98,14 +93,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.4-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.4-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec index b7a520096..874974b0b 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec @@ -1,53 +1,80 @@ -# Default version for this component -%define tde_pkg ksystemlog +# +# spec file for package ksystemlog (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg ksystemlog +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: System log viewer tool for Trinity +Group: Applications/System +URL: http://ksystemlog.forum-software.org -Name: trinity-%{tde_pkg} -Summary: system log viewer tool for Trinity -Version: 0.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/System +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ksystemlog.forum-software.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description ksystemlog is a system log viewer tool for Trinity. @@ -58,16 +85,20 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -100,31 +131,27 @@ 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}" -%clean -%__rm -rf %{buildroot} - +# Missing category will make this fail. +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%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 || : +%clean +%__rm -rf %{buildroot} %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_tdeappdir}/ksystemlog.desktop +%{tde_datadir}/apps/ksystemlog/ %{tde_datadir}/config.kcfg/ksystemlog.kcfg %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz %{tde_tdedocdir}/HTML/en/ksystemlog/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec index bbf8a68bc..8251cdf6d 100644 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec +++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ksystemlog %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: system log viewer tool for Trinity Version: 0.3.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System @@ -67,7 +62,7 @@ quickly see problems occuring on their server. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -125,15 +120,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.2-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec index 04386cbe1..9fec6ce5a 100644 --- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec +++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg ktechlab +# +# spec file for package ktechlab (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg ktechlab +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Circuit simulator for microcontrollers and electronics [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: circuit simulator for microcontrollers and electronics [Trinity] -Version: 0.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description KTechlab is a circuit simulator with a nice, clickable and discoverable @@ -58,16 +85,20 @@ as PIC programming in its own Basic dialect and some form of assembler. Homepage: http://ktechlab.org/ -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -103,24 +134,25 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -%clean -%__rm -rf %{buildroot} +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}" +%__rm -rf "%{?buildroot}%{tde_datadir}/applnk" +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r -n ktechlab Science Math +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/ktechlab %{tde_bindir}/microbe -%{tde_datadir}/applnk/Development/ktechlab.desktop +%{tde_tdeappdir}/ktechlab.desktop %{tde_datadir}/apps/katepart/syntax/microbe.xml %{tde_datadir}/apps/ktechlab %{tde_datadir}/config.kcfg/ktechlab.kcfg @@ -133,5 +165,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec index 95b225c77..9d0799c7f 100644 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec +++ b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ktechlab %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: circuit simulator for microcontrollers and electronics [Trinity] Version: 0.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -70,7 +65,7 @@ Homepage: http://ktechlab.org/ %patch0 -p1 -b .ftbfs %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -135,18 +130,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3 -- Initial release for TDE 3.5.13.1 - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Fix list of icons to install [Bug #990] diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent-14.0.0.spec index 36112872f..2ecf72dac 100644 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec +++ b/redhat/applications/ktorrent/ktorrent-14.0.0.spec @@ -1,55 +1,84 @@ -# Default version for this component -%define tde_pkg ktorrent +# +# spec file for package ktorrent (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg ktorrent +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: BitTorrent client for Trinity -Version: 2.2.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.2.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: BitTorrent client for Trinity +Group: Applications/Utilities +URL: http://ktorrent.org -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ktorrent.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + +# GMP support +BuildRequires: gmp-devel + # AVAHI support # Disabled on RHEL4 and RHEL5 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} @@ -73,16 +102,20 @@ certain file types (video and audio) and integration into the TDE Panel enabling background downloading. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -129,19 +162,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -174,7 +194,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/ktwebinterfaceplugin.la %{tde_tdelibdir}/ktwebinterfaceplugin.so %{tde_tdeappdir}/ktorrent.desktop -%{tde_datadir}/apps/ktorrent +%{tde_datadir}/apps/ktorrent/ %{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz @@ -189,5 +209,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec index 5324722a6..992ef2e1a 100644 --- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec +++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg ktorrent %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: BitTorrent client for Trinity Version: 2.2.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -82,7 +77,7 @@ enabling background downloading. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -187,24 +182,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.8-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-2 -- Initial release for TDE 3.5.13.1 - -* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1 -- Rename old tq methods that no longer need a unique name [Commit #a90eb215] -- Remove additional unneeded tq method conversions [Commit #bb37c405] -- Rename obsolete tq methods to standard names [Commit #0d48fca8] -- Rename a few stragglers [Commit #c3480dfe] -- Fix inadvertent "TQ" changes. [Commit #445a5152] -- Fix configure output message to clarify that missing avahi support is caused by missing avahi-tqt package as well as avahi-client. [Commit #03d0c794] -- Update ktorrent package to 2.2.8 and fix internal geoip database. [Bug #363] [Commit #5af9907f] -- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69] - -* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec index 1a43024fb..1862df13f 100644 --- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec +++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec @@ -1,74 +1,116 @@ -# Default version for this component -%define tde_pkg kuickshow +# +# spec file for package kuickshow (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kuickshow +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8.13 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Quick picture viewer for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: Quick picture viewer for TDE -Version: 0.8.13 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} +BuildRequires: autoconf automake libtool m4 +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 + +# IMLIB1 support +%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} BuildRequires: imlib-devel %endif -%if 0%{?suse_version} || 0%{?mgaversion} +%if 0%{?mgaversion} BuildRequires: imlib1-devel %endif +# GIF support +%if 0%{?suse_version} || 0%{?fedora} >= 28 +BuildRequires: giflib-devel +%else +BuildRequires: libungif-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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -101,21 +143,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{?buildroot} +# Missing category will make this fail. +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %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 @@ -131,5 +166,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-9 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec index b34d3ca68..e87b7ad2f 100644 --- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec +++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kuickshow %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Quick picture viewer for TDE Version: 0.8.13 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -68,7 +63,7 @@ Clicking on an image shows the image in its normal size. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -130,33 +125,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-8 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-7 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5 -- Initial release for TDE 3.5.13.1 - -* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3 -- Removes conflict with 'kdegraphics' - -* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3 -- Rename old tq methods that no longer need a unique name [Commit #8712ab46] -- Remove additional unneeded tq method conversions [Commit #28d9c774] -- Rename obsolete tq methods to standard names [Commit #bdeb8b3a] -- Remove inadvertent renaming [Commit #d97e403f] [Bug #863] - -* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2 -- Import to GIT - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1 -- Correct macro to install under "/opt", if desired - -* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index 7b5242932..fd781dae3 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -1,57 +1,87 @@ -# REMOVE KDELIBS4-DEVEL before building !!!! +%if 0%{?fedora} >= 23 +%define _hardened_ldflags %nil +%endif -# Default version for this component -%define tde_pkg kvirc +# +# spec file for package kvirc (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kvirc +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Trinity based next generation IRC client with module support -Version: 3.4.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 3.4.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity based next generation IRC client with module support +Group: Applications/Utilities +URL: http://kvirc.net/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kvirc.net/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: %{name}-data = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +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 + +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} + %description A highly configurable graphical IRC client with an MDI interface, @@ -66,7 +96,7 @@ you need to install the kvirc-dev package. %package data Group: Applications/Utilities Summary: Data files for KVIrc -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description data This package contains the architecture-independent data needed by KVIrc in @@ -82,7 +112,7 @@ with the Trinity Desktop Environment version 3. %package devel Group: Development/Libraries Summary: Development files for KVIrc -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains KVIrc libraries and include files you need if you @@ -92,17 +122,28 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "admin/acinclude.m4.in" \ + -i "src/kvilib/tal/kvi_tal_application.cpp" \ + -e "/TDEApplication/ s|\")|\", true, true, true)|"; +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" ./autogen.sh @@ -140,6 +181,10 @@ export PATH="%{tde_bindir}:${PATH}" %__make symlinks -C src/kvilib/build %__make symlinks -C src/kvirc/build +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +%__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||" +%endif + %__make %{?_smp_mflags} @@ -153,20 +198,18 @@ export PATH="%{tde_bindir}:${PATH}" %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \ %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA +# Move desktop file to XDG location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file kvirc Network IRCClient +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files @@ -180,8 +223,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %defattr(-,root,root,-) %{tde_bindir}/kvi_run_netscape %{tde_bindir}/kvi_search_help +%exclude %{tde_libdir}/kvirc/*/modules/*.la +%exclude %{tde_libdir}/kvirc/*/modules/*.so %{tde_libdir}/kvirc/ -%{tde_datadir}/applnk/Internet/kvirc.desktop +%{tde_tdeappdir}/kvirc.desktop %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.svgz %{tde_datadir}/icons/hicolor/*/*/*.xpm @@ -200,5 +245,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec index 36374f071..32c340e5b 100644 --- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec +++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec @@ -4,11 +4,6 @@ %define tde_pkg kvirc %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -29,7 +24,7 @@ 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}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -116,7 +111,7 @@ with the K Desktop Environment version 3. -e "s|/opt/kde3|%{tde_prefix}|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" ./autogen.sh @@ -214,26 +209,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.4.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-3 -- Initial release for TDE 3.5.13.1 - -* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Rename old tq methods that no longer need a unique name [Commit #32a249ba] -- Remove additional unneeded tq method conversions [Commit #f9114981] -- Rename obsolete tq methods to standard names [Commit #2dd6d32b] -- Rename a few stragglers [Commit #1c00d6ff] -- Fix FTBFS [Commits #ff96f491, #2285efe5] -- Fix linear alphabet string errors [Commit #51bbe9e5] -- Fix inadvertent "TQ" changes. [Commit #a24a8595] -- Fix "acinclude.m4" file [Bug #980] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kvkbd/kvkbd-14.0.0.spec b/redhat/applications/kvkbd/kvkbd-14.0.0.spec index 6ab5f5c5b..43f84afa1 100644 --- a/redhat/applications/kvkbd/kvkbd-14.0.0.spec +++ b/redhat/applications/kvkbd/kvkbd-14.0.0.spec @@ -1,68 +1,100 @@ -# Default version for this component -%define tde_pkg kvkbd +# +# spec file for package kvkbd (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kvkbd +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Virtual keyboard for TDE [Trinity] -Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Virtual keyboard for TDE +Group: Applications/System +URL: http://pan4os.info/main/index.php -License: GPLv2+ -Group: Applications/System +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://pan4os.info/main/index.php +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -96,32 +128,28 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Move desktop file to XDG location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r kvkbd Utility Accessibility +%endif -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +%clean +%__rm -rf %{buildroot} %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_tdeappdir}/kvkbd.desktop +%{tde_datadir}/apps/kvkbd/ %{tde_datadir}/icons/hicolor/*/apps/kvkbd.png %{tde_tdedocdir}/HTML/en/kvkbd/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec index 763f674f2..0e66dd2ad 100644 --- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec +++ b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kvkbd %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Virtual keyboard for TDE [Trinity] Version: 0.4.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System @@ -62,7 +57,7 @@ a systray widget as well as a dockwidget. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -120,15 +115,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.patch b/redhat/applications/kvpnc/kvpnc-14.0.0.patch new file mode 100644 index 000000000..1d5b6b300 --- /dev/null +++ b/redhat/applications/kvpnc/kvpnc-14.0.0.patch @@ -0,0 +1,19 @@ +--- 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-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec index f5bb1e88f..1049cc33a 100644 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec +++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec @@ -1,56 +1,86 @@ -# Default version for this component -%define tde_pkg kvpnc +# +# spec file for package kvpnc (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg kvpnc +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: vpn clients frontend for TDE -Version: 0.9.6a -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.6a +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Vpn clients frontend for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: kvpnc-14.0.0-fix_install.patch +Patch0: %{tde_pkg}-14.0.0.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 +BuildRequires: autoconf automake libtool m4 +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 + +BuildRequires: libgcrypt-devel >= 1.2.0 + + %description KVpnc is a TDE frontend for various vpn clients. @@ -61,24 +91,27 @@ It supports : * Virtual Private Network daemon (openvpn) -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .installdir +%patch0 -p1 -b .installdir %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -106,25 +139,11 @@ export PATH="%{_bindir}:${PATH}" %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} -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 %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO @@ -142,7 +161,4 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||: %{tde_datadir}/services/pcf.protocol -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6a-1 -- Initial release for TDE 14.0.0 - +%changelog diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec new file mode 100644 index 000000000..cf0447a98 --- /dev/null +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -0,0 +1,173 @@ +# +# spec file for package kxmleditor (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg kxmleditor +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: XML Editor for TDE +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + +Requires: mplayer + + +%description +KXML Editor is a simple program, that displays and edits the contents of an +XML file. It can be embedded in Quanta, and used with DCOP. + +The left side contains a tree representing the XML document structure. The +right side contains a list of attributes for the selected XML element and its +contents. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +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 \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + +# Move desktop icon to correct location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor +%endif + + +%clean +%__rm -rf %{buildroot} + + +%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_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 + + +%post + + +%postun + + +%changelog diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec index 58fb85948..60963069d 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec @@ -1,47 +1,84 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package mplayerthumbs (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg mplayerthumbs -%define tde_version 14.0.0 - -# TDE 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 %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 -%define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Version: 0.5b -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: A video thumbnail generator for TDE file managers. +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.5b +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A video thumbnail generator for TDE file managers +Group: Applications/Multimedia +URL: http://kde-apps.org/content/show.php?content=41180 -Group: Applications/Multimedia -License: GPLv2+ -URL: http://kde-apps.org/content/show.php?content=41180 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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: autoconf automake libtool m4 +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 + +# MPLAYER support Requires: mplayer + %description MPlayerThumbs is a video thumbnail generator for TDE file managers (Konqueror, Dolphin, ...). @@ -53,23 +90,26 @@ It catches a random frame from 15% to 70%, checking also how contrasted is the image, and dropping bad frames. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -113,8 +153,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5b-2 -- Initial release for TDE 14.0.0 - -* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 0.5b-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec index 55153629e..7bcffe525 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab-14.0.0.spec @@ -1,55 +1,93 @@ -# Default version for this component -%define tde_pkg piklab +# +# spec file for package piklab (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg piklab +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - -Name: trinity-%{tde_pkg} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.15.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: IDE for PIC-microcontroller development [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + +# READLINE support BuildRequires: readline-devel +# LIBUSB support +%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +BuildRequires: %{_lib}usb1.0-devel +BuildRequires: %{_lib}usb-compat0.1-devel +%else +BuildRequires: libusb-devel +%endif + + %description Piklab is an integrated development environment for applications based on Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. @@ -60,24 +98,28 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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}" # 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} \ @@ -93,10 +135,21 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ +%if 0%{?rhel} == 5 + --disable-libreadline \ +%endif + +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif %__make %{?_smp_mflags} +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif + %install export PATH="%{tde_bindir}:${PATH}" @@ -112,17 +165,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -145,5 +187,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec index a44e1fd82..425bb42a5 100644 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ b/redhat/applications/piklab/piklab-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg piklab %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: IDE for PIC-microcontroller development [Trinity] Version: 0.15.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -69,7 +64,7 @@ are supported. A command-line programmer and debugger are also available. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -148,21 +143,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4 -- Initial release for TDE 3.5.13.1 - -* Fri Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3 -- Fix MAN directory location -- Fix compilation with GCC 4.7 [Bug #958] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/potracegui/potracegui-14.0.0.spec b/redhat/applications/potracegui/potracegui-14.0.0.spec index d5a69e65f..f11bdd5e4 100644 --- a/redhat/applications/potracegui/potracegui-14.0.0.spec +++ b/redhat/applications/potracegui/potracegui-14.0.0.spec @@ -1,70 +1,102 @@ -# Default version for this component -%define tde_pkg potracegui +# +# spec file for package potracegui (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg potracegui +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE frontend for potrace [Trinity] +Group: Applications/Multimedia +URL: http://potracegui.sourceforge.net -Name: trinity-%{tde_pkg} -Summary: TDE frontend for potrace [Trinity] -Version: 1.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Multimedia +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %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. +remote files (web, ftp, ...) is also supported. + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -97,34 +129,30 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Move desktop file to XDG location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file potracegui -G "Potrace GUI" Graphics VectorGraphics +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %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_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 %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec index 25db4b67d..d8b4709c7 100644 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ b/redhat/applications/potracegui/potracegui-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg potracegui %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: TDE frontend for potrace [Trinity] Version: 1.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -64,7 +59,7 @@ remote files (web, ftp, ...) is also supported. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -125,15 +120,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec new file mode 100644 index 000000000..365e96bd8 --- /dev/null +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -0,0 +1,171 @@ +# +# spec file for package qalculate-tde (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg qalculate-tde +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.7 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Powerful and easy to use desktop calculator - TDE version +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +BuildRequires: libqalculate-devel >= 0.9.6 + +%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 +BuildRequires: cln-devel +%endif +%if 0%{?pclinuxos} >= 2018 +BuildRequires: libcln-devel +%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 + + +%description +Qalculate! is small and simple to use but with much power and versatility +underneath. Features include customizable functions, units, arbitrary +precision, plotting, and a graphical interface that uses a one-line +fault-tolerant expression entry (although it supports optional traditional +buttons). + +This package contains the TDE user interface of qalculate. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +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 \ + --disable-gcc-hidden-visibility + +%if 0%{?mgaversion} >= 6 +%__sed -i "src/Makefile" -e "s|-Wl,--no-undefined||" +%endif + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang qalculate_tde + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file qalculate_tde -r TDE Utility Calculator +%endif + + +%clean +%__rm -rf %{buildroot} + + +%files -f qalculate_tde.lang +%defattr(-,root,root,-) +%{tde_bindir}/qalculate +%{tde_bindir}/qalculate-tde +%{tde_datadir}/apps/qalculate_tde/ +%{tde_tdeappdir}/qalculate_tde.desktop +%{tde_tdedocdir}/HTML/en/qalculate_tde/ +%{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png +%{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png + + +%changelog 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-14.0.0.spec index 1726c0611..bced59322 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-14.0.0.spec @@ -1,58 +1,84 @@ -%if "%{?_qt4_plugindir}" == "" -%define _qt4_plugindir %{_libdir}/qt4/plugins -%endif - -# Default version for this component -%define tde_pkg qt4-tqt-theme-engine +# +# spec file for package qt4-tqt-theme-engine (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg qt4-tqt-theme-engine +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - +%if "%{?_qt4_plugindir}" == "" +%define _qt4_plugindir %{_libdir}/qt4/plugins +%endif -Name: trinity-%{tde_pkg} -Summary: TDE theme engine for Qt4 -Version: 0.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE theme engine for Qt4 +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + # QT4 support %if 0%{?suse_version} BuildRequires: qt-devel @@ -60,14 +86,19 @@ BuildRequires: qt-devel BuildRequires: qt4-devel %endif + %description TDE theme engine for Qt4 -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -78,7 +109,7 @@ TDE theme engine for Qt4 %endif # Fix TDE include directory -%__sed -i */*.pro -e "s|INCLUDEPATH += /opt/trinity/include|INCLUDEPATH += /opt/trinity/include/tde|" +%__sed -i */*.pro -e "s|INCLUDEPATH += /opt/trinity/include|INCLUDEPATH += %{tde_tdeincludedir}|" %build @@ -116,9 +147,8 @@ export PATH="%{tde_bindir}:${PATH}" %{_libdir}/libtdeqt4interface.so.1 %{_libdir}/libtdeqt4interface.so.1.0 %{_libdir}/libtdeqt4interface.so.1.0.0 +%dir %{_qt4_plugindir}/styles/ %{_qt4_plugindir}/styles/libsimplestyleplugin.so %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec index 2eaaeebfe..e24652adf 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec @@ -1,56 +1,84 @@ -# Default version for this component -%define tde_pkg rosegarden +# +# spec file for package rosegarden (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg rosegarden +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +# Required for Mageia 2: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 -Name: trinity-%{tde_pkg} -Summary: music editor and MIDI/audio sequencer [Trinity] -Version: 1.7.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.7.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Music editor and MIDI/audio sequencer [Trinity] +Group: Applications/Multimedia +URL: http://www.rosegardenmusic.com/ -License: GPLv2+ -Group: Applications/Multimedia +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.rosegardenmusic.com/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: cmake libtool +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 + BuildRequires: fftw-devel BuildRequires: liblo-devel BuildRequires: fontconfig-devel @@ -72,12 +100,25 @@ BuildRequires: %{_lib}jack-devel BuildRequires: jack-audio-connection-kit-devel %endif +# ACL support +BuildRequires: libacl-devel + # LIRC support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 %define with_lirc 1 BuildRequires: lirc-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 + Requires: lilypond Requires: perl-XML-Twig @@ -91,8 +132,12 @@ Requires: libsndfile-utils %endif %endif +# OPENSSL support +BuildRequires: openssl-devel + + +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-data == %{version}-%{release} %description Rosegarden is a TDE application which provides a mixed Audio/MIDI @@ -102,7 +147,7 @@ lilypond and Csound files export, etc. %package data Group: Applications/Multimedia -Requires: %{name} == %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Summary: music editor and MIDI/audio sequencer data files [Trinity] %description data @@ -114,10 +159,14 @@ lilypond and Csound files export, etc. This package provides the data files necessary for running Rosegarden -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -176,21 +225,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -217,5 +251,3 @@ done %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec index 4dc15831a..6a96604e9 100644 --- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec +++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec @@ -5,11 +5,6 @@ # Required for Mageia 2: removes the ldflag '--no-undefined' %define _disable_ld_no_undefined 1 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -30,7 +25,7 @@ Name: trinity-%{tde_pkg} Summary: music editor and MIDI/audio sequencer [Trinity] Version: 1.7.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -220,21 +215,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-6 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-5 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.0-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3 -- Initial release for TDE 3.5.13.1 - -* Fri Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2 -- Updated to build with gcc 4.7. [Commit #15276f36] -- Enables JACK support - -* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec index aefc18948..27ed4338c 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec @@ -1,67 +1,143 @@ -# Default version for this component -%define tde_pkg smartcardauth +# +# spec file for package smartcardauth (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg smartcardauth +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +%if 0%{?fedora} >= 27 +%define debug_package %{nil} +%endif -Name: trinity-%{tde_pkg} -Summary: SmartCard Login and LUKS Decrypt, Setup Utility -Version: 1.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: SmartCard Login and LUKS Decrypt, Setup Utility +Group: Applications/System +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/System +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-%{tde_pkg}-rpmlintrc -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: autoconf automake libtool m4 +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 + #BuildRequires: perl-PAR-Packer + +# PCSC support %if 0%{?mgaversion} || 0%{?mdkversion} -Requires: perl-pcsc-perl +Requires: perl-pcsc-perl %endif %if 0%{?rhel} || 0%{?fedora} -Requires: pcsc-perl +Requires: pcsc-perl +%endif +%if 0%{?suse_version} +Requires: perl-pcsc +%endif + +# PKCS11 support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}pkcs11-helper-devel %endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: pkcs11-helper-devel +%endif + +# 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 + +# PAM support +BuildRequires: pam-devel + +# TLS support %if 0%{?suse_version} -Requires: perl-pcsc +BuildRequires: libgnutls-devel +%else +BuildRequires: gnutls-devel %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 +- TDE, 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: @@ -73,73 +149,65 @@ 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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 +cd src +make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %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} +%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}" -%__mkdir_p %{buildroot}%{_sysconfdir} -%__cp -Rp etc/* %{buildroot}%{_sysconfdir} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop" +%endif %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 +%{_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 %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec index e7c9a8b1d..18d214b2c 100644 --- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec +++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg smartcardauth %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: SmartCard Login and LUKS Decrypt, Setup Utility Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/System @@ -141,15 +136,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc new file mode 100644 index 000000000..7dc0bac20 --- /dev/null +++ b/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc @@ -0,0 +1 @@ +setBadness('64bit-portability-issue', 0) diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k-14.0.0.spec index fb499cc17..9e30a9b06 100644 --- a/redhat/applications/smb4k/smb4k-14.0.0.spec +++ b/redhat/applications/smb4k/smb4k-14.0.0.spec @@ -1,54 +1,81 @@ -# Default version for this component -%define tde_pkg smb4k +# +# spec file for package smb4k (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg smb4k +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - -Name: trinity-%{tde_pkg} -Summary: A Samba (SMB) share advanced browser for Trinity -Version: 0.9.4 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A Samba (SMB) share advanced browser for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software @@ -82,26 +109,14 @@ possible. %{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}/apps/smb4k/ +%{tde_datadir}/apps/smb4knetworkbrowserpart/ +%{tde_datadir}/apps/smb4ksharesiconviewpart/ +%{tde_datadir}/apps/smb4kshareslistviewpart/ %{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 @@ -117,24 +132,19 @@ Requires: %{name} = %{version}-%{release} %{tde_libdir}/libsmb4kcore.la %{tde_libdir}/libsmb4kcore.so -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -170,11 +180,18 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%suse_update_desktop_file -r %{tde_pkg} System Network +%endif + +# Removes duplicate files +%fdupes -s %buildroot + %clean %__rm -rf %{buildroot} %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec index 353bd9ae8..de9634699 100644 --- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec +++ b/redhat/applications/smb4k/smb4k-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg smb4k %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: A Samba (SMB) share advanced browser for Trinity Version: 0.9.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -134,7 +129,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -177,18 +172,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.4-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-3 -- Initial release for TDE 3.5.13.1 - -* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2 -- Rebuild for Fedora 17 -- Fix compilation with GCC 4.7 |Commit #b4c7fd48] - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 48516a2ee..25ee3424d 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -1,52 +1,91 @@ -# Default version for this component -%define tde_pkg soundkonverter +# +# spec file for package soundkonverter (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg soundkonverter +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - -Name: trinity-%{tde_pkg} -Summary: audio converter frontend for Trinity -Version: 0.3.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Audio converter frontend for Trinity +Group: Application/Multimedia +URL: http://potracegui.sourceforge.net -License: GPLv2+ -Group: Application/Multimedia +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + +# TAGLIB support +BuildRequires: taglib-devel + +# CDDA support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libcdda-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: cdparanoia-devel +%endif + %description soundKonverter is a frontend to various audio converters. @@ -69,26 +108,29 @@ 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: %{name} = %{?epoch:%{epoch}:}%{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. +See the 'trinity-soundkonverter' package for more information. + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -123,19 +165,14 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files -f %{tde_pkg}.lang @@ -146,11 +183,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{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 +%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/ +%{tde_tdedocdir}/HTML/en/soundkonverter/ %{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png %{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop %{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop @@ -168,10 +202,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files amarok %defattr(-,root,root,-) -%{tde_datadir}/apps/soundkonverter/amarokscript/README -%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb +%{tde_datadir}/apps/soundkonverter/amarokscript/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec index ef5605ff3..c64351829 100644 --- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec +++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg soundkonverter %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" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: audio converter frontend for Trinity Version: 0.3.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Application/Multimedia @@ -88,7 +83,7 @@ See the 'soundkonverter-trinity' package for more information. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -174,15 +169,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.8-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec new file mode 100644 index 000000000..83d184d95 --- /dev/null +++ b/redhat/applications/tastymenu/tastymenu.spec @@ -0,0 +1,151 @@ +# +# spec file for package tastymenu (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tastymenu +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Replacement for TMenu +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + + +%description +Tasty Menu is a TMenu replacement aiming to provide the maximum usability and flexibility. + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +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 \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%{tde_tdelibdir}/tastymenu_panelapplet.la +%{tde_tdelibdir}/tastymenu_panelapplet.so +%{tde_datadir}/apps/kicker/applets/tastymenu.desktop +%{tde_datadir}/config.kcfg/tastymenu.kcfg +%{tde_tdedocdir}/HTML/en/tastymenu/ + + +%post + + +%postun + + +%changelog diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index e17320149..02b6c3b33 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -1,53 +1,65 @@ -# Default version for this component -%define tde_pkg tde-guidance +# +# spec file for package tde-guidance (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# REMOVE KDELIBS4-DEVEL before building !!!! - -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tde-guidance +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define __arch_install_post %{nil} -Name: trinity-%{tde_pkg} -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8.0svn20080103 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: A collection of system administration tools for Trinity +Group: Applications/Utilities +URL: http://www.simonzone.com/software/guidance + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/guidance +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-%{tde_pkg}-rpmlintrc -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 @@ -56,7 +68,21 @@ BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel BuildRequires: trinity-python-trinity BuildRequires: chrpath + +BuildRequires: autoconf automake libtool m4 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 # SIP support BuildRequires: sip4-tqt-devel >= 4.10.5 @@ -67,6 +93,53 @@ BuildRequires: python-tqt-devel BuildRequires: trinity-python-trinity-devel BuildRequires: trinity-pytqt-tools +# LIBXXF86VM support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}xxf86vm-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 +BuildRequires: libXxf86vm-devel +%endif + +# XSCREENSAVER support +# 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} +%define with_xscreensaver 1 + +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extras +%if 0%{?fedora} +BuildRequires: xscreensaver-extras-base +%endif +BuildRequires: xscreensaver-gl-base +BuildRequires: xscreensaver-gl-extras +%endif + +%if 0%{?suse_version} +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra +%endif + +%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 +%endif + Requires: python-tqt Requires: trinity-python-trinity Requires: trinity-pytdeextensions @@ -75,13 +148,14 @@ Requires: python Requires: hwdata %endif -Requires: %{name}-backends = %{version}-%{release} +Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release} # POWERMANAGER support (requires HAL) #define with_powermanager 1 +Obsoletes: trinity-tde-guidance-powermanager -Obsoletes: trinity-guidance < %{version}-%{release} -Provides: trinity-guidance = %{version}-%{release} +Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release} %description Guidance currently consists of four programs designed to help you @@ -130,16 +204,6 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/pics/processor.png %endif -%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 @@ -150,8 +214,8 @@ Requires: hwdata %endif Requires: python -Obsoletes: trinity-guidance-backends < %{version}-%{release} -Provides: trinity-guidance-backends = %{version}-%{release} +Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release} %description backends This package contains the platform neutral backends used in the @@ -159,6 +223,7 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) +%dir %{python_sitearch}/%{name} %{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/drivedetect.py* %{python_sitearch}/%{name}/wineread.py* @@ -173,11 +238,11 @@ Guidance configuration tools. %package powermanager Group: Applications/Utilities Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: hal -Obsoletes: trinity-guidance-powermanager < %{version}-%{release} -Provides: trinity-guidance-powermanager = %{version}-%{release} +Obsoletes: trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{tde_prefix}" == "/usr" Conflicts: guidance-power-manager @@ -205,19 +270,11 @@ suspend using HAL. %{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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -386,5 +443,3 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-8 -- Initial release for TDE 14.0.0 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 index dc77f43b5..7fbb91222 100644 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec @@ -6,11 +6,6 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -32,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: A collection of system administration tools for Trinity Version: 0.8.0svn20080103 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -469,28 +464,3 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; %changelog -* Sun May 18 2014 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-8 -- Backport fixes from R14 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-7 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-6 -- Work around mountconfig incorrectly handling LABEL tag - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-4 -- Initial release for TDE 3.5.13.1 - -* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3 -- Fix Python search dir - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix library locations - -* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc new file mode 100644 index 000000000..bd7a50a17 --- /dev/null +++ b/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc @@ -0,0 +1 @@ +setBadness('file-contains-buildroot', 0) diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec new file mode 100644 index 000000000..99325e85b --- /dev/null +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -0,0 +1,194 @@ +# +# spec file for package tde-style-baghira (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tde-style-baghira +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: TDE style for Apple junkies :) +Group: Graphical desktop/TDE +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +BuildRequires: libjpeg-devel +%else +BuildRequires: jpeg-devel +%endif + +%description +Based upon mosfet-liquid0.9.6pre4... the last heir of mosfet. +Baghira includes both an style (custom widgets) and twin decoration as +well as colour schemes. + +Baghira (panther, in german) makes TDE resemble Apple's MacOS X's Aqua, +Panther and Jaguar looks, and also includes its own 'Baghira' look + + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/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} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{tde_bindir}/bab +%{tde_libdir}/libbaghirastarter.la +%{tde_libdir}/libbaghirastarter.so +%{tde_tdelibdir}/b_menu_panelapplet.la +%{tde_tdelibdir}/b_menu_panelapplet.so +%{tde_tdelibdir}/plugins/styles/baghira.la +%{tde_tdelibdir}/plugins/styles/baghira.so +%{tde_tdelibdir}/tdestyle_baghira_config.la +%{tde_tdelibdir}/tdestyle_baghira_config.so +%{tde_tdelibdir}/twin3_baghira.la +%{tde_tdelibdir}/twin3_baghira.so +%{tde_tdelibdir}/twin_baghira_config.la +%{tde_tdelibdir}/twin_baghira_config.so +%{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/tdedisplay/color-schemes/AquaBlue.kcsrc +%{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc +%{tde_datadir}/apps/tdestyle/themes/baghira.themerc +%{tde_datadir}/apps/twin/baghira.desktop +%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_blue.png +%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_grey.png +%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_white.png +%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_yellow.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_blue.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_grey.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_white.png +%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_yellow.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_itunes.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_jaguar.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_milk.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_panther.png +%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_tiger.png +%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_blue.png +%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_grey.png +%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_white.png +%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_yellow.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_blue.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_grey.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_white.png +%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_yellow.png +%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_blue.png +%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_grey.png +%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_white.png +%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_yellow.png +%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira.png +%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_blue.png +%{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 + + +%changelog diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec new file mode 100644 index 000000000..bb6f54b26 --- /dev/null +++ b/redhat/applications/tde-style-domino/tde-style-domino.spec @@ -0,0 +1,140 @@ +# +# spec file for package domino (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tde-style-domino +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Domino widget style and twin decoration for TDE +Group: Graphical desktop/TDE +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} +BuildRequires: libjpeg-devel +%else +BuildRequires: jpeg-devel +%endif + +%description +Domino is a style with a soft look. It allows to fine adjust the shininess +of the widgets by customizable color gradients. + + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/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} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{tde_tdelibdir}/plugins/styles/domino.la +%{tde_tdelibdir}/plugins/styles/domino.so +%{tde_tdelibdir}/tdestyle_domino_config.la +%{tde_tdelibdir}/tdestyle_domino_config.so +%{tde_tdelibdir}/twin3_domino.la +%{tde_tdelibdir}/twin3_domino.so +%{tde_tdelibdir}/twin_domino_config.la +%{tde_tdelibdir}/twin_domino_config.so +%{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc +%{tde_datadir}/apps/tdestyle/themes/domino.themerc +%{tde_datadir}/apps/twin/domino.desktop + + +%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 new file mode 100644 index 000000000..56d664a5c --- /dev/null +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -0,0 +1,134 @@ +# +# spec file for package tde-style-ia-ora (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tde-style-ia-ora +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_tdeappdir %{tde_datadir}/applications/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.8 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Mandriva theme for TDE - Widget design +Group: Environment/Desktop +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +Requires: trinity-twin + +Obsoletes: trinity-style-ia-ora < %{version}-%{release} +Provides: trinity-style-ia-ora = %{version}-%{release} + +%description +Mandriva theme for Trinity + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/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} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{?buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/plugins/styles/ia_ora.la +%{tde_tdelibdir}/plugins/styles/ia_ora.so +%{tde_tdelibdir}/twin3_iaora.la +%{tde_tdelibdir}/twin3_iaora.so +%{tde_tdelibdir}/twin_iaora_config.la +%{tde_tdelibdir}/twin_iaora_config.so +%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc +%{tde_datadir}/apps/twin/iaora.desktop + + +%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-14.0.0.spec index e12f00f24..055ca88d7 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec @@ -1,43 +1,58 @@ -# Default version for this component -%define tde_pkg tde-style-lipstik +# +# spec file for package tde-style-lipstik (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tde-style-lipstik +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-tde-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.2.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Lipstik style for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz @@ -46,12 +61,25 @@ 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 +BuildRequires: autoconf automake libtool m4 +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 + %description Based on the plastik style, Lipstik is a purified style with many options to @@ -60,16 +88,20 @@ tune your desktop look. Lipstik also provides Lipstik-color-schemes -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -120,5 +152,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-6 -- Initial release for TDE 14.0.0 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 index 3661eebfb..08e51de57 100644 --- 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 @@ -2,11 +2,6 @@ %define tde_pkg tde-style-lipstik %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-tde-style-lipstik Summary: Lipstik style for TDE Version: 2.2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -69,7 +64,7 @@ Lipstik also provides Lipstik-color-schemes %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -119,19 +114,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec index b2ba06252..3bb94eadd 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec @@ -1,59 +1,104 @@ -# Default version for this component -%define tde_pkg tde-style-qtcurve +# +# spec file for package tde-style-qtcurve (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tde-style-qtcurve +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.55.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: This is a set of widget styles for Trinity based apps +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: cmake libtool +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 + +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# GAMIN support +# Not on openSUSE. +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_gamin 1 +BuildRequires: gamin-devel +%endif + +# OPENSSL support +BuildRequires: openssl-devel + + 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. @@ -62,10 +107,14 @@ This package is most useful when installed together with gtk2-engines-qtcurve. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -137,9 +186,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/plugins/styles/qtcurve.la %{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc %{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc -%{tde_datadir}/apps/QtCurve/*.qtcurve +%{tde_datadir}/apps/QtCurve/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-7 -- Initial release for TDE 14.0.0 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 index 79a1fa67d..562fb4510 100644 --- 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 @@ -2,11 +2,6 @@ %define tde_pkg tde-style-qtcurve %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -142,21 +137,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4 -- Initial release for TDE 3.5.13.1 - -* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3 -- Switch to v3.5.13-sru branch - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory index 687a493c4..d37d9ba13 100644 --- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory +++ b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory @@ -11,3 +11,4 @@ Name[pt_BR]=Energia Name[ru]=Управление питанием Name[sv]=Effekt Icon=energy +OnlyShowIn=TDE; diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index a19ade93c..812b2329d 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -1,83 +1,116 @@ -# Default version for this component -%define tde_pkg tde-systemsettings +# +# spec file for package tde-systemsettings (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -# Currently, menu files under /etc/xdg conflict with KDE4 -%define tde_sysconfdir %{tde_prefix}/etc %endif - -# TDE specific building variables +%define tde_pkg tde-systemsettings +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_sysconfdir %{_sysconfdir}/trinity +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.0svn20070312 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Easy to use control centre for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-tde-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 +Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release} + BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: 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 + 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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}" %configure \ @@ -111,39 +144,39 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory -%clean -%__rm -rf %{buildroot} +%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop + +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" -%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 +%clean +%__rm -rf %{buildroot} -%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 +%dir %{tde_sysconfdir}/xdg +%dir %{tde_sysconfdir}/xdg/menus +%dir %{tde_sysconfdir}/xdg/menus/applications-merged %{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu %{tde_sysconfdir}/xdg/menus/tde-system-settings.menu %{tde_bindir}/systemsettings %{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/laptop.desktop %{tde_datadir}/applications/tde/medianotifications.desktop %{tde_datadir}/applications/tde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/systemsettingsui.rc -%{tde_datadir}/config/systemsettingsrc +%{tde_datadir}/apps/systemsettings/ +%{tde_confdir}/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png %{tde_tdedocdir}/HTML/en/systemsettings/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-9 -- Initial release for TDE 14.0.0 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 index cf9b3a815..c06af35f6 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec @@ -4,7 +4,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt # Currently, menu files under /etc/xdg conflict with KDE4 %define tde_sysconfdir %{tde_prefix}/etc %endif @@ -29,7 +28,7 @@ Name: trinity-tde-systemsettings Summary: easy to use control centre for TDE Version: 0.0svn20070312 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -71,7 +70,7 @@ Control Centre with an improved user interface. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -144,27 +143,3 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8 -- Build for Fedora 19 - -* Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7 -- Rebuild - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5 -- Initial release for TDE 3.5.13.1 - -* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4 -- Fix XDG menu directory location (again) - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3 -- Updates 'Requires: trinity-guidance' to reflect package renaming - -* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2 -- Fix XDG menu directory location - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec index 4759dabe3..c405bfa07 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec @@ -1,52 +1,80 @@ -# Default version for this component -%define tde_pkg tdeio-apt +# +# spec file for package tdeio-apt (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdeio-apt +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: An apt-cache ioslave for Trinity -Version: 0.13.2 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.13.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An apt-cache ioslave for Trinity +Group: Applications/Utilities +URL: http://lpnotfr.free.fr/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description tdeio-apt is an ioslave which provides the apt:/ protocol. It @@ -58,16 +86,19 @@ browsing the packages easier. It provides: - apt-cache policy: apt:/policy?package -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -112,8 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %doc AUTHORS CHANGELOG ChangeLog COPYING %{tde_tdelibdir}/tdeio_apt.la %{tde_tdelibdir}/tdeio_apt.so -%{tde_datadir}/apps/tdeio_apt/kdedeb_logo.png -%{tde_datadir}/apps/tdeio_apt/tdeio_apt.css +%{tde_datadir}/apps/tdeio_apt/ %{tde_datadir}/services/apt+http.protocol %{tde_datadir}/services/apt.protocol %{tde_datadir}/services/searchproviders/apt-file.desktop @@ -122,5 +152,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-3 -- Initial release for TDE 14.0.0 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 index 316566375..e45848c73 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-apt %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: An apt-cache ioslave for Trinity Version: 0.13.2 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -70,7 +65,7 @@ browsing the packages easier. It provides: %patch1 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -124,9 +119,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.13.2-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec index d0d2c3112..53b766cbe 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec @@ -1,73 +1,109 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package tdeio-ftps (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 %endif - -# Default version for this component %define tde_pkg tdeio-ftps -%define tde_version 14.0.0 - -# TDE 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 %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_tdeappdir %{tde_datadir}/applications/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} -Version: 0.1 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: An ftps TDEIO slave for Trinity +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: An ftps TDEIO slave for Trinity +Group: Productivity/Networking/Ftp/Clients +URL: http://www.trinitydesktop.org/ -Group: Productivity/Networking/Ftp/Clients -License: GPLv2+ -URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +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: autoconf automake libtool m4 +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 + Obsoletes: trinity-kio-ftps < %{version}-%{release} Provides: trinity-kio-ftps < %{version}-%{release} + %description An ftps TDEIO slave for Trinity, based on rfc4217. It should work yet with most server implementations. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - %configure \ --prefix=%{tde_prefix} \ @@ -75,6 +111,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -101,8 +138,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-2 -- Initial release for TDE 14.0.0 - -* Sat Mar 09 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec index d3a53bd8a..2c389bbee 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec @@ -1,57 +1,101 @@ -# Default version for this component -%define tde_pkg tdeio-locate +# +# spec file for package tdeio-locate (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdeio-locate +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Tdeio-slave for the locate command [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org -Name: trinity-%{tde_pkg} -Summary: tdeio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: libtool +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 + +# ACL support +BuildRequires: libacl-devel + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel 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. @@ -61,10 +105,14 @@ would in a terminal. The result is displayed just as a directory. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -126,5 +174,3 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/searchproviders/locate.desktop %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-6 -- Initial release for TDE 14.0.0 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 index 4d8c47caa..508da013b 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-locate %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: kio-slave for the locate command [Trinity] Version: 0.4.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -131,20 +126,3 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/searchproviders/locate.desktop %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.5-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Fix compilation with GCC 4.7 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec index 5ff803701..45275c610 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec @@ -1,48 +1,91 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +# +# spec file for package tdeio-sword (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/ +# + +# Required for PCLinuxOS: removes the ldflag '--no-undefined' +%if 0%{?pclinuxos} >= 2018 +%define _disable_ld_no_undefined 1 %endif -# Default version for this component -%define tde_pkg tdeio-sword +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# TDE specific building variables +%endif +%define tde_pkg tdeio-sword +%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_tdeappdir %{tde_datadir}/applications/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} -Version: 0.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: tdeio-slave for the Sword Bible tool +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Tdeio-slave for the Sword Bible tool +Group: Productivity/Networking/Ftp/Clients +URL: http://lukeplant.me.uk/kio-sword/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Group: Productivity/Networking/Ftp/Clients -License: GPLv2+ -URL: http://lukeplant.me.uk/kio-sword/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +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: autoconf automake libtool m4 +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 + +# Requires: sword +BuildRequires: sword-devel +Requires: sword + + %description TDEio-Sword provides access to Bibles, commentaries and other texts in an easy to use and attractive @@ -51,16 +94,20 @@ using the SWORD Bible project and implementing a TDE ioslave, providing the sword:/ protocol. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -74,6 +121,7 @@ export PATH="%{tde_bindir}:${PATH}" --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ \ --disable-dependency-tracking \ --disable-debug \ @@ -83,7 +131,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 --with-sword-dir=%{tde_prefix} %endif @@ -95,27 +143,12 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -%post -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 -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 - - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/tdeio_sword.la %{tde_tdelibdir}/tdeio_sword.so -%{tde_datadir}/apps/tdeio_sword/swordvertical.png -%{tde_datadir}/apps/tdeio_sword/tdeio_sword.css +%{tde_datadir}/apps/tdeio_sword/ %{tde_tdedocdir}/HTML/en/tdeio_sword/ %{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png %{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz @@ -123,5 +156,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec index 36fe098ba..bb0651cf0 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec @@ -1,50 +1,63 @@ -# Default version for this component -%define tde_pkg tdeio-umountwrapper +# +# spec file for package tdeio-umountwrapper (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdeio-umountwrapper +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Progress dialog for safely removing devices in Trinity +Group: Applications/Utilities +URL: http://frode.kde.no/misc/tdeio_umountwrapper/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://frode.kde.no/misc/tdeio_umountwrapper/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: media_safelyremove.desktop_tdeio -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 @@ -52,21 +65,41 @@ BuildRequires: desktop-file-utils Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} Provides: trinity-kio-umountwrapper = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +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 + + %description Wrapper around tdeio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -129,9 +162,9 @@ fi %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/tdeio_umountwrapper %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper +%dir %{tde_datadir}/apps/d3lphin +%dir %{tde_datadir}/apps/d3lphin/servicemenus %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-8 -- Initial release for TDE 14.0.0 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 index f83a7fffa..22903f422 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-umountwrapper %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -66,7 +61,7 @@ Provides a progress dialog for Safely Removing of devices in Trinity. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -133,25 +128,3 @@ fi %changelog -* Sat Sep 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-7 -- Fix inadvertent 'kio' renaming - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3 -- Add 'desktop' file, to make this program useful :-) - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index 5df794508..02cd9c010 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -1,52 +1,81 @@ -# Default version for this component -%define tde_pkg tdenetworkmanager +# +# spec file for package tdenetworkmanager (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdenetworkmanager +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.9 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity applet for Network Manager +Group: Applications/Internet +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Summary: Trinity applet for Network Manager +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Group: Applications/Internet -License: GPLv2+ -#URL: http://en.opensuse.org/Projects/KNetworkManager -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: %{name}-rpmlintrc -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 +BuildRequires: cmake libtool +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 Obsoletes: trinity-knetworkmanager < %{version}-%{release} Provides: trinity-knetworkmanager = %{version}-%{release} @@ -64,21 +93,75 @@ Requires: NetworkManager-gnome Requires: networkmanager %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} == 0 BuildRequires: NetworkManager-glib-devel %endif +%endif %if 0%{?suse_version} BuildRequires: NetworkManager-devel Requires: NetworkManager %endif +# ACL support +BuildRequires: libacl-devel + # DBUS support BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 +# ACL support +BuildRequires: libacl-devel + +# UDEV support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +BuildRequires: libudev-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 + +# OPENSSL support +BuildRequires: openssl-devel + + %description TDENetworkManager is a system tray applet for controlling network connections on systems that use the NetworkManager daemon. +%post +# Prevent autostart of 'nm-applet', if installed. +if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then + if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then + sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|" + fi +fi + +%files +%defattr(-,root,root,-) +%{tde_bindir}/tdenetworkmanager +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf +%{tde_tdeappdir}/tdenetworkmanager.desktop +%{tde_datadir}/apps/tdenetworkmanager +%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager* +%{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/ + +########## %package devel Summary: Common data shared among the MySQL GUI Suites @@ -88,13 +171,22 @@ Requires: %{name} = %{version}-%{release} %description devel Development headers for tdenetworkmanager +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_tdelibdir}/*.la +%{tde_tdelibdir}/*.so + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + -%prep +%prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -131,60 +223,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{?buildroot} -C build +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet +%endif + %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 || : -# Prevent autostart of 'nm-applet', if installed. -if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then - if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then - sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|" - fi -fi - -%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}/tdenetworkmanager -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf -%{tde_tdeappdir}/tdenetworkmanager.desktop -%{tde_datadir}/apps/tdenetworkmanager -%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager* -%{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/ - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_tdelibdir}/*.la -%{tde_tdelibdir}/*.so - - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc new file mode 100644 index 000000000..8668d5e81 --- /dev/null +++ b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc @@ -0,0 +1 @@ +setBadness('suse-dbus-unauthorized-service', 0) diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 42b4a214e..613e0ba2f 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -1,55 +1,133 @@ -# Default version for this component -%define tde_pkg tdepowersave +# +# spec file for package tdepowersave (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdepowersave +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 0.7.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -Summary: Power management applet for Trinityfiles or directories. +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Power management applet for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else License: GPLv2+ -Group: Applications/Utilities +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 +BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 + +BuildRequires: cmake libtool +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 + +# UDEV support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define with_tdehwlib 1 +BuildRequires: libudev-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 + +# ACL support +BuildRequires: libacl-devel + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + Obsoletes: trinity-kpowersave < %{version}-%{release} Provides: trinity-kpowersave = %{version}-%{release} + %description TDEPowersave is a TDE systray applet which allows to control the power management settings and policies of your computer. @@ -80,10 +158,14 @@ settings for: * notification settings -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -110,6 +192,7 @@ fi \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -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} \ @@ -133,11 +216,6 @@ export PATH="%{tde_bindir}:${PATH}" %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 || : - # Disables automatic poweroff, make sure we match both "kpowersave" and "tdepowersave" if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then %__cp -f "/etc/acpi/actions/power.sh" "/etc/acpi/actions/power.sh.tdepowersavebackup" @@ -145,12 +223,7 @@ if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then fi %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 || : - -if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then +if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then %__mv -f "/etc/acpi/actions/power.sh.tdepowersavebackup" "/etc/acpi/actions/power.sh" fi @@ -164,20 +237,18 @@ fi %{tde_tdelibdir}/tdepowersave.la %{tde_tdelibdir}/tdepowersave.so %{tde_tdeappdir}/tdepowersave.desktop -%{tde_datadir}/apps/tdepowersave/eventsrc -%{tde_datadir}/apps/tdepowersave/icons/*/*/*/*.png +%{tde_datadir}/apps/tdepowersave/ %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/autostart/tdepowersave-autostart.desktop -%{tde_datadir}/config/tdepowersaverc +%{tde_confdir}/tdepowersaverc %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/ %lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/ %lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/ %lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/ %lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/ +%lang(nb) %dir %{tde_tdedocdir}/HTML/nb %lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/ %changelog -* Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 40ad0415c..7b15298df 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -1,77 +1,122 @@ -# Default version for this component -%define tde_pkg tderadio -%define tde_version 14.0.0 +# +# spec file for package tderadio (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/ +# -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%define with_lirc 1 %endif -# TDE specific building variables +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tderadio +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%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:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1.1.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Comfortable Radio Application for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + BuildRequires: libsndfile-devel %{?with_lirc:BuildRequires: lirc-devel} +# 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} -BuildRequires: %{_lib}twolame-devel +%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: libtwolame-devel +BuildRequires: libmp3lame-devel %endif -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: lame-devel %endif +%endif +%endif Obsoletes: trinity-kradio < %{version}-%{release} Provides: trinity-kradio = %{version}-%{release} + %description -KRadio is a comfortable radio application for Trinity with support for +TDERadio is a comfortable radio application for Trinity with support for V4L and V4L2 radio cards drivers. -KRadio currently provides +TDERadio currently provides * V4L/V4L2 radio support %if 0%{?with_lirc} @@ -84,22 +129,26 @@ KRadio currently provides * Extendable plugin architecture This package also includes a growing collection of station preset -files for many cities around the world contributed by KRadio users. +files for many cities around the world contributed by TDERadio users. -As KRadio is based on an extendable plugin architecture, contributions +As TDERadio 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -133,6 +182,10 @@ export PATH="%{tde_bindir}:${PATH}" --enable-alsa \ --enable-oss +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||" +%endif + %__make %{?_smp_mflags} @@ -143,34 +196,28 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner +%endif + %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 %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/convert-presets %{tde_bindir}/tderadio +%dir %{tde_libdir}/tderadio +%dir %{tde_libdir}/tderadio/plugins %{tde_libdir}/tderadio/plugins/*.la %{tde_libdir}/tderadio/plugins/*.so %{tde_tdeappdir}/tderadio.desktop %{tde_datadir}/apps/tderadio/ +%dir %{tde_datadir}/icons/hicolor/256x256 +%dir %{tde_datadir}/icons/hicolor/256x256/actions %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo @@ -178,5 +225,3 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||: %{tde_tdedocdir}/HTML/en/tderadio/ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec index 0e30e1b7a..04b82fc4e 100644 --- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec +++ b/redhat/applications/tderadio/tderadio-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tderadio %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -30,7 +25,7 @@ Name: trinity-%{tde_pkg} Summary: Comfortable Radio Application for TDE [Trinity] Version: 0.1.1.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -99,7 +94,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -174,25 +169,3 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||: %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-7 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-6 -- Initial release for TDE 3.5.13.2 - -* Sat Dec 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-5 -- Updates presets - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4 -- Initial release for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3 -- Rebuild for RHEL 5 -- Fix postinstall - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdesudo/tdesudo-14.0.0.spec b/redhat/applications/tdesudo/tdesudo-14.0.0.spec index 8f1736926..9cb1a2d09 100644 --- a/redhat/applications/tdesudo/tdesudo-14.0.0.spec +++ b/redhat/applications/tdesudo/tdesudo-14.0.0.spec @@ -1,73 +1,105 @@ -# Default version for this component -%define tde_pkg tdesudo +# +# spec file for package tdesudo (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdesudo +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: sudo frontend for Trinity +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.5.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Sudo frontend for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Version: 2.5.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + 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} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -113,5 +145,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec index fdea492db..e7dd22faf 100644 --- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec +++ b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdesudo %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: sudo frontend for Trinity Version: 2.5.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -67,7 +62,7 @@ It allows you to run programs as another user by entering your password. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -113,19 +108,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch new file mode 100644 index 000000000..b22e7f2e4 --- /dev/null +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.patch @@ -0,0 +1,57 @@ +--- 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-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index bff026e15..675f25b7f 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -1,58 +1,111 @@ -# Default version for this component -%define tde_pkg tdesvn +# +# spec file for package tdesvn (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdesvn +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: subversion client with tight TDE integration [Trinity] -Version: 1.0.4 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.4 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Subversion client with tight TDE integration +Group: Applications/Utilities +URL: http://www.elliptique.net/~ken/kima/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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-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 libtool +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 + +# SVN support BuildRequires: subversion-devel -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-libsvnqt = %{version}-%{release} -Obsoletes: trinity-kdesvn < %{version}-%{release} -Provides: trinity-kdesvn = %{version}-%{release} +# SQLITE support +BuildRequires: sqlite-devel +BuildRequires: libtqt3-mt-sqlite3 + +# ACL support +BuildRequires: libacl-devel + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + + +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release} + %description TDESvn is a graphical client for the subversion revision control @@ -62,6 +115,38 @@ 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. +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/tdesvn +%{tde_bindir}/tdesvnaskpass +%{tde_tdelibdir}/tdesvnpart.la +%{tde_tdelibdir}/tdesvnpart.so +%{tde_datadir}/applications/tde/tdesvn.desktop +%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh +%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd +%{tde_datadir}/apps/tdesvn/ +%{tde_datadir}/apps/tdesvnpart/ +%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop +%{tde_datadir}/config.kcfg/tdesvn_part.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%{tde_datadir}/icons/hicolor/*/*/*.svgz +%{tde_mandir}/man1/tdesvn.1* +%{tde_mandir}/man1/tdesvnaskpass.1* +%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/ +%{tde_libdir}/libksvnwidgets.la +%{tde_libdir}/libksvnwidgets.so +%{tde_libdir}/libsvnfrontend.la +%{tde_libdir}/libsvnfrontend.so +%{tde_libdir}/libtdesvncfgreader.la +%{tde_libdir}/libtdesvncfgreader.so +%{tde_libdir}/libtdesvnevents.la +%{tde_libdir}/libtdesvnevents.so +%{tde_libdir}/libtdesvnhelpers.la +%{tde_libdir}/libtdesvnhelpers.so + +########## %package -n trinity-libsvnqt Group: Development/Libraries @@ -74,9 +159,16 @@ subversion library. It is based on the RapidSvn SvnCpp library, a subversion client API written in C++. +%files -n trinity-libsvnqt +%defattr(-,root,root,-) +%{tde_libdir}/libsvnqt.so.4 +%{tde_libdir}/libsvnqt.so.4.2.2 + +########## + %package -n trinity-libsvnqt-devel Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: qt-devel Requires: subversion-devel Summary: Qt wrapper library for subversion (development files) [Trinity] @@ -85,42 +177,85 @@ Summary: Qt wrapper library for subversion (development files) [Trinity] This package contains the header files and symbolic links that developers using svnqt will need. +%files -n trinity-libsvnqt-devel +%defattr(-,root,root,-) +%{tde_includedir}/svnqt +%{tde_libdir}/libsvnqt.so + +########## %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} +Obsoletes: trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, +This packages includes TDEIO slaves for svn, svn+file, svn+http, svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled TDE application. +inside any TDEIO enabled TDE application. This package is part of tdesvn-trinity. +%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 + +%files tdeio-plugins +%defattr(-,root,root,-) +%{tde_datadir}/services/kded/tdesvnd.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}/tdeio_ksvn.la +%{tde_tdelibdir}/tdeio_ksvn.so +%{tde_tdelibdir}/kded_tdesvnd.la +%{tde_tdelibdir}/kded_tdesvnd.so + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/tde/HTML,g" \ - \; +rm -f src/svnqt/CMakeLists.txt.orig +rm -fr src/svnqt/cache/sqlite3/ %build unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export PATH="%{tde_bindir}:${PATH}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" if ! rpm -E %%cmake|grep -q "cd build"; then @@ -142,7 +277,6 @@ fi -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} \ \ @@ -169,108 +303,14 @@ export PATH="%{_bindir}:${PATH}" # Locales %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl +%endif + %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 %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/tdesvn -%{tde_bindir}/tdesvnaskpass -%{tde_tdelibdir}/tdesvnpart.la -%{tde_tdelibdir}/tdesvnpart.so -%{tde_datadir}/applications/tde/tdesvn.desktop -%{tde_datadir}/tdeconf_update/tdesvn-use-external-update.sh -%{tde_datadir}/tdeconf_update/tdesvnpartrc-use-external.upd -%{tde_datadir}/tdesvn/tdesvnui.rc -%{tde_datadir}/tdesvnpart/tdesvn_part.rc -%{tde_datadir}/konqueror/servicemenus/tdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/tdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/tdesvn.1* -%{tde_mandir}/man1/tdesvnaskpass.1* -%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/ -%{tde_libdir}/libksvnwidgets.la -%{tde_libdir}/libksvnwidgets.so -%{tde_libdir}/libsvnfrontend.la -%{tde_libdir}/libsvnfrontend.so -%{tde_libdir}/libtdesvncfgreader.la -%{tde_libdir}/libtdesvncfgreader.so -%{tde_libdir}/libtdesvnevents.la -%{tde_libdir}/libtdesvnevents.so -%{tde_libdir}/libtdesvnhelpers.la -%{tde_libdir}/libtdesvnhelpers.so -#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png -#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz - -%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/tdesvnd.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}/tdeio_ksvn.la -%{tde_tdelibdir}/tdeio_ksvn.so -%{tde_tdelibdir}/kded_tdesvnd.la -%{tde_tdelibdir}/kded_tdesvnd.so - - %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index 6f6a3625c..06473162e 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdesvn %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: subversion client with tight TDE integration [Trinity] Version: 1.0.4 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -258,25 +253,3 @@ fi %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.4-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-4 -- Initial release for TDE 3.5.13.1 - -* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-3 -- Installs SVN protocols as alternative, avoids conlict with TDESDK - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix compilation with GCC 4.7 - -* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec index 88bb45713..84ef1bb30 100644 --- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec +++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec @@ -1,74 +1,102 @@ -# Default version for this component -%define tde_pkg tdmtheme +# +# spec file for package tdmtheme (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tdmtheme +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.2.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Theme manager for TDM +Group: Applications/Utilities +URL: http://beta.smileaf.org/projects -Name: trinity-%{tde_pkg} -Summary: theme manager for TDM [Trinity] -Version: 1.2.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + 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. - +tdmtheme is a theme manager for TDM. It provides a Trinity Control Module (TDECM) +that allows you to easily install, remove and change your TDM themes. +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -106,7 +134,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} - %files %defattr(-,root,root,-) %{tde_tdelibdir}/kcm_tdmtheme.la @@ -115,13 +142,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdedocdir}/HTML/en/tdmtheme/ -%post -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -update-desktop-database %{tde_appdir} &> /dev/null - - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec index 23c609037..8691353fc 100644 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdmtheme %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: theme manager for TDM [Trinity] Version: 1.2.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -68,7 +63,7 @@ that allows you to easily install, remove and change your KDM themes. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -122,22 +117,3 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-6 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5 -- Fix tdmtheme crash. This resolves Bug 1544 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Removes the 'lintian' stuff from Debian - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index 26b065bdc..8cb0aae90 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -1,61 +1,121 @@ -# Default version for this component -%define tde_pkg tellico -%define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt +%if 0%{?fedora} >= 23 +%define _hardened_ldflags %nil %endif -# TDE specific building variables +# +# spec file for package tellico (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_pkg tellico +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.3.2.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Icollection manager for books, videos, music [Trinity] +Group: Applications/Utilities +URL: http://periapsis.org/tellico/ -Name: trinity-%{tde_pkg} -Summary: Icollection manager for books, videos, music [Trinity] -Version: 1.3.2.1 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://periapsis.org/tellico/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 - -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-tdemultimedia-devel >= %{tde_version} +BuildRequires: trinity-libkcal-devel >= %{tde_version} +BuildRequires: trinity-libpoppler-tqt-devel >= %{tde_version} BuildRequires: desktop-file-utils - BuildRequires: gettext +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: fdupes + +# POPPLER support +%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libpoppler-devel >= 0.12 +%else +BuildRequires: poppler-devel >= 0.12 +%endif +%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 +%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 + +# YAZ support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: yaz BuildRequires: %{_lib}yaz-devel %endif +# XML2 support +BuildRequires: libxml2-devel + +# XSLT support +BuildRequires: libxslt-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 + # V4L support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} BuildRequires: libv4l-devel @@ -64,8 +124,39 @@ BuildRequires: libv4l-devel BuildRequires: %{_lib}v4l-devel %endif -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-scripts = %{version}-%{release} +# EXEMPI support +%if 0%{?suse_version} +BuildRequires: libexempi-devel +%else +BuildRequires: exempi-devel +%endif + +# PCRE support +BuildRequires: pcre-devel + +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + +# ACL support +BuildRequires: libacl-devel + +# ATTR support +BuildRequires: libattr-devel + + +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release} + %description Tellico is a collection manager for TDE. It includes default collections for @@ -81,6 +172,13 @@ 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. +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%{tde_bindir}/tellico +%{tde_datadir}/applications +%{tde_confdir}/tellicorc + +########## %package data Group: Applications/Utilities @@ -103,6 +201,35 @@ 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. +%files data +%defattr(-,root,root,-) +%dir %{tde_datadir}/apps/tellico +%{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/hicolor/*/apps/tellico.png +%{tde_datadir}/icons/hicolor/*/mimetypes/application-x-tellico.png +%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg +%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg +%{tde_datadir}/mime/packages/tellico.xml +%{tde_datadir}/mimelnk/application/x-tellico.desktop +%{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl +%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd +%{tde_datadir}/apps/tdeconf_update/tellico.upd + +########## + %package scripts Group: Applications/Utilities Summary: collection manager for books, videos, music [scripts] [Trinity] @@ -125,47 +252,60 @@ 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. +%files scripts +%defattr(-,root,root,-) +%{tde_datadir}/apps/tellico/data-sources +%{tde_datadir}/apps/tellico/z3950-servers.cfg + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} if [ -r /usr/include/libv4l1-videodev.h ]; then -%patch1 -p1 -b .videodev +%__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|" fi -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# 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} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +# Warning: GCC visibility causes FTBFS [Bug #1285] +%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=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --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} \ \ - --enable-webcam + -DWITH_ALL_OPTIONS=ON \ + -DWITH_LIBKCDDB=ON \ + -DWITH_LIBKCAL=ON \ + -DWITH_LIBBTPARSE=OFF \ + -DWITH_SAX_LOADER=ON \ + .. %__make %{?_smp_mflags} || %__make @@ -173,11 +313,11 @@ export PATH="%{tde_bindir}:${PATH}" %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=$RPM_BUILD_ROOT -C build # 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 +%__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} @@ -186,51 +326,4 @@ export PATH="%{tde_bindir}:${PATH}" %__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/tdeconf_update/tellico-1-3-update.pl -%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd -%{tde_datadir}/apps/tdeconf_update/tellico.upd - -%files scripts -%defattr(-,root,root,-) -%{tde_datadir}/apps/tellico/data-sources -%{tde_datadir}/apps/tellico/z3950-servers.cfg - - %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-8 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec index 20549a7e5..ce72709c0 100644 --- a/redhat/applications/tellico/tellico-3.5.13.2.spec +++ b/redhat/applications/tellico/tellico-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tellico %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Icollection manager for books, videos, music [Trinity] Version: 1.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -141,7 +136,7 @@ fi %patch2 -p1 -b .ftbfs %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -235,23 +230,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3 -- Fix compilation with GCC 4.7 [Bug #958] - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec index a750ee4e4..4682ab764 100644 --- a/redhat/applications/tork/tork-14.0.0.spec +++ b/redhat/applications/tork/tork-14.0.0.spec @@ -1,70 +1,113 @@ -# Default version for this component -%define tde_pkg tork +# +# spec file for package tork (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg tork +%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/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-tork -Version: 0.33 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: Anonymity Manager for TDE +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.33 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Anonymity Manager for TDE +Group: Applications/Internet +URL: sourceforge.net/projects/tolrk/ -Group: Applications/Internet -License: GPLv2+ -URL: sourceforge.net/projects/tolrk/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-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-tdepim-devel >= %{tde_version} + +BuildRequires: autoconf automake libtool m4 +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 + +# TORSOCKS support BuildRequires: torsocks +# OPENSSL support +BuildRequires: openssl-devel + + %description TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on Konqueror/Firefox/Opera. Send anonymous email via the MixMinion network. Use ssh/irc/IM anonymously. Control and monitor your anonymous traffic on the Tor network. -%if 0%{?suse_version} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # NOTICE: --enable-final causes FTBFS ! %configure \ @@ -97,18 +140,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf $RPM_BUILD_ROOT -%post -for i in hicolor 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 - -%postun -for i in hicolor 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 - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO ChangeLog USINGTORK @@ -124,15 +155,12 @@ done %{tde_tdedocdir}/HTML/en/tork/ %{tde_datadir}/icons/hicolor/*/actions/tork.png %{tde_datadir}/icons/hicolor/*/apps/tork.png +%dir %{tde_datadir}/menu %{tde_datadir}/menu/tork +%dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/tork.xpm %{tde_mandir}/man1/tork.1* %{tde_mandir}/man1/torkarkollon.1* %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.33-2 -- Initial release for TDE 14.0.0 - -* Thu Apr 25 2013 Francois Andriot <francois.andriot@free.fr> - 0.33-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec index d96a0462a..9f22e2596 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec @@ -1,57 +1,85 @@ -# Default version for this component -%define tde_pkg twin-style-crystal +# +# spec file for package twin-style-crystal (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg twin-style-crystal +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - -Name: trinity-%{tde_pkg} -Summary: Semi transparant window decoration for Trinity. -Version: 1.0.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.5 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Semi transparant window decoration for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + 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 @@ -61,17 +89,19 @@ 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -122,5 +152,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-5 -- Initial release for TDE 14.0.0 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 index 79136634a..328988582 100644 --- 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 @@ -2,11 +2,6 @@ %define tde_pkg twin-style-crystal %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Semi transparant window decoration for Trinity. Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -71,7 +66,7 @@ And it is of course nice to look at. Upstream says: %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -120,14 +115,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 -- Initial release for TDE 3.5.13.1 - -* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec index 70298de9d..fdd4e9b31 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec @@ -1,56 +1,110 @@ -# Default version for this component -%define tde_pkg wlassistant +# +# spec file for package wlassistant (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg wlassistant +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%define _docdir %{tde_tdedocdir} - -Name: trinity-%{tde_pkg} -Summary: User friendly TDE frontend for wireless network connection [Trinity] -Version: 0.5.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.5.7 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: User friendly TDE frontend for wireless network connection +Group: Applications/Utilities +URL: http://wlassistant.sourceforge.net/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://wlassistant.sourceforge.net/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: cmake libtool +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 + +# 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 + +# 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 +# PYTHON support BuildRequires: python -BuildRequires: cmake >= 2.8 + +# OPENSSL support +BuildRequires: openssl-devel + %description Wireless Assistant scans for wireless access points and displays link quality, @@ -59,11 +113,13 @@ 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} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -110,17 +166,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files @@ -143,5 +196,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-5 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec index b1a07813d..264a650c2 100644 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg wlassistant %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -143,14 +138,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.5.7-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2 -- Initial release for TDE 3.5.13.1 - -* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec index 50b4d4848..147f62366 100644 --- a/redhat/applications/yakuake/yakuake-14.0.0.spec +++ b/redhat/applications/yakuake/yakuake-14.0.0.spec @@ -1,66 +1,97 @@ -# Default version for this component -%define tde_pkg yakuake +# +# spec file for package yakuake (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg yakuake +%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%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 -%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:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 2.8.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: autoconf automake libtool m4 +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 + %description Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -98,15 +129,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 @@ -120,5 +142,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-7 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec index bd9b54200..2cca734ce 100644 --- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec +++ b/redhat/applications/yakuake/yakuake-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg yakuake %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ 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}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -60,7 +55,7 @@ Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -117,24 +112,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/config.kcfg/*.kcfg %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-6 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.8.1-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4 -- Initial release for TDE 3.5.13.1 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-2 -- Import to GIT - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0 -- Initial release for RHEL 6.0 - diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index d36f44299..b61478d84 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -4,52 +4,22 @@ # Example: build_rpm_package.sh tdebase 14.0.0 -PKGNAME="${1##*/}" +PKGNAME="${1%/}" +PKGNAME="${PKGNAME##*/}" TDE_VERSION="${2:-14.0.0}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) -SOURCES=$(get_source_files.sh ${PKGNAME} ${TDE_VERSION}) -TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :) VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac DIST="$(rpmdist.sh --dist)" -BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" -BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" -LOGFILE=/tmp/log.${COMP##*/} +[ -z "${TMPPATH}" ] && TMPPATH="/dev/shm" +BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)" +BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" +LOGFILE="${TMPPATH}/log.${COMP##*/}" -TEMPDIR="$(mktemp -d)" -cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}" - -# Check if there are local patches -PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}" -PATCHLIST="${PATCHDIR}/patches" -if [ -r "${PATCHLIST}" ]; then - while read l; do - APPLY="" - case "${l}" in - ""|"#"*);; - *"opensuse"*) [ -r /etc/SuSE-release ] && APPLY=1;; - *) APPLY=1;; - esac - - if [ "${APPLY}" ]; then - if [ -r "${PATCHDIR}/${l}" ]; then - echo "Applying patch '${l}'..." - cat "${PATCHDIR}/${l}" >>"${TEMPDIR}/one.patch" - else - echo "ERROR: invalid patch '${l}' !!" - exit 3 - fi - fi - done < "${PATCHLIST}" -fi - -if [ -r "${TEMPDIR}/one.patch" ]; then - sed -i "${TEMPDIR}/"*.spec \ - -e "/^Source0:/ s/$/\nPatch0: one.patch/" \ - -e "/%setup/ s/$/\n%patch0 -p1/" -fi +export TEMPDIR="$(mktemp -d)" +gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}" [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" @@ -61,6 +31,7 @@ rpmbuild -ba \ --define "_sourcedir ${TEMPDIR}" \ --define "_builddir ${BUILDDIR}" \ --define "_buildrootdir ${BUILDROOTDIR}" \ + --define "_tmppath ${TMPPATH}" \ --define "_rpmdir ${RPMDIR}" \ --define "_srcrpmdir ${SRPMDIR}" \ --define '_build_create_debug 1' \ @@ -68,13 +39,9 @@ rpmbuild -ba \ --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \ --define "tde_version ${TDE_VERSION}" \ --define "tde_prefix /opt/trinity" \ - --define "preversion ${PREVERSION:-}" \ - --define "with_akode 1" \ - --define "with_jack 1" \ - --define "with_lame 1" \ - --define "with_mad 1" \ + --define "prevers${PREVERSION:+ion} ${PREVERSION:-0}" \ + --define "tde_patch 1" \ --define "with_mpeg 1" \ - --define "with_xscreensaver 1" \ "${TEMPDIR}/${SPECFILE##*/}" RET=$? diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 18c91eb1a..d280319f0 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -4,6 +4,9 @@ TDE_VERSION=${1:-14.0.0} ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) +[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch" +[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" + # RHEL / CentOS / Fedora if [ -x /usr/bin/yum ]; then cat <<EOF >/tmp/rpmbuild-tde.repo @@ -23,14 +26,22 @@ EOF fi # Mageia / Mandriva -if [ -x /usr/sbin/urpmi ]; then +if [ -x "/usr/sbin/urpmi" ]; then sudo urpmi.removemedia -y "rpmbuild" - sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH} - sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch + sudo urpmi.addmedia "rpmbuild.${ARCH}" "${RPMDIR}/${ARCH}" + sudo urpmi.addmedia "rpmbuild.noarch" "${RPMDIR}/noarch" fi # openSUSE if [ -x /usr/bin/zypper ]; then - sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH} - sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch + sudo rm -f "/etc/zypp/repos.d/rpmbuild"* + sudo zypper ar -G "${RPMDIR}/${ARCH}" "rpmbuild.${ARCH}" + sudo zypper ar -G "${RPMDIR}/noarch" "rpmbuild.noarch" +fi + +# PCLOS +if [ -x "/usr/bin/apt-get" ]; then + [ ! -L "${RPMDIR}/RPMS.${ARCH}" ] && ln -sf "${ARCH}" "${RPMDIR}/RPMS.${ARCH}" + [ ! -L "${RPMDIR}/RPMS.noarch" ] && ln -sf "noarch" "${RPMDIR}/RPMS.noarch" + echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" | sudo tee "/etc/apt/sources.list.d/rpmbuild.list" fi diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh new file mode 100755 index 000000000..98b67cbdc --- /dev/null +++ b/redhat/build/gather_rpm_sources.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] +# Example: build_rpm_package.sh tdebase 14.0.0 + + +PKGNAME="${1%/}" +PKGNAME="${PKGNAME##*/}" +TDE_VERSION="${2:-14.0.5}" +TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" +DIST="$4" + +SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) +[ -z "${SPECFILE}" ] && exit 1 + +SOURCES=$(get_source_files.sh ${PKGNAME} ${TDE_VERSION} ${DIST}) +TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :) +VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) +case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac + +DIST="$(rpmdist.sh --dist)" +[ -z "${TMPPATH}" ] && TMPPATH="/dev/shm" +BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)" +BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" +LOGFILE="${TMPPATH}/log.${COMP##*/}" + +mkdir -p "${TARGETDIR}" +rm -f "${TARGETDIR}/"* + +cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}" + +### Check for patches + +PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}" +if [ -d "${PATCHDIR}" ]; then + cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch" + sed -i "${TARGETDIR}/"*".spec" \ + -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ + -e "/%setup/ s/$/\n%patch389 -p1/" +fi + +exit $RET diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 5a8e282b8..4df81b12b 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -13,8 +13,8 @@ if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" ${PKGNAME}) fi -VERSION=${VERSION/-*_/\~} -VERSION=${VERSION%-[0-9]} +VERSION=${VERSION/-0_/\~} +#VERSION=${VERSION%-[0-9]} VERSION=${VERSION%.opt} VERSION=${VERSION%.[a-z]*} diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index ccbb0acf0..a459ced19 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -9,17 +9,12 @@ RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" RPMDIR_NOARCH="${RPMDIR}/noarch" RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}" -case "${PKGNAME##*/}" in - "tqt3") PKGNAME="libtqt3-mt";; - "tqtinterface") PKGNAME="libtqt4";; - "koffice") PKGNAME="koffice-suite";; - "tde-i18n") PKGNAME="tde-i18n-French";; -esac +RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" -RPM=$(find ${RPMDIRS} -name "trinity-${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1) +RPM=$(find ${RPMDIRS} -name "trinity-${RPM_PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1) if [ ! -r "${RPM}" ]; then - RPM=$(find ${RPMDIRS} -name "${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1) + RPM=$(find ${RPMDIRS} -name "${RPM_PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1) if [ ! -r "${RPM}" ]; then echo "Error, cannot find any package for '${PKGNAME}' !" exit 1 diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index a361ff7b7..44d3896b6 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -10,9 +10,8 @@ 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} -VERSION=${VERSION%.[a-z]*} -VERSION=${VERSION/-*_/\~} - +VERSION=${VERSION%.opt} # Remove '.opt' suffix +VERSION=${VERSION%.[a-z]*} # Remove distro suffix (e.g. '.el6') +VERSION=${VERSION/-*_0_/\~} echo $VERSION diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 3cdeb904d..7901d0915 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -6,22 +6,37 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tde-tarballs/${TDE_VERSION}/ [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging -[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat/ +[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/ + +EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" + +RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) +[ -r "${RET}" ] && echo "${RET}" && exit 0 + +RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) +[ -r "${RET}" ] && echo "${RET}" && exit 0 RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1) -if [ -z "${RET}" ]; then - RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) -fi -if [ ! -r "${RET}" ]; then - # Retry without 'trinity-*', and allow any TAR extension. - RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1) - if [ ! -r "${RET}" ]; then - # 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 -n | tail -n 1) - fi -fi - -[ -z "${RET}" ] && exit 2 - -echo "${RET}" +[ -r "${RET}" ] && echo "${RET}" && exit 0 + +RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | 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 -n | 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 -n | 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 -n | 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 -n | tail -n 1) +[ -r "${RET}" ] && echo "${RET}" && exit 0 + + exit 0 diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 520da9e6a..2989aebef 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -20,11 +20,11 @@ case "${PKGNAME}" in # In case prefix is already there, don't add it again. "trinity-"*) PREFIX="";; # Most TDE dependencies have no prefix - "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") 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 - "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff - "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; + "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other "curl") PREFIX="trinity-lib";; # Default case: add prefix @@ -40,23 +40,33 @@ fi case "${PKGNAME}" in # Some packages have different runtime name than source package. - "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";; - "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; - "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; - "esound") PKGRUNTIME="esound-libs";; - "koffice") PKGRUNTIME="koffice-suite";; - "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";; - "libcaldav") PKGRUNTIME="${lib}caldav0";; - "libcarddav") PKGRUNTIME="${lib}carddav0";; - "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; - "tqca") PKGRUNTIME="${lib}tqca1";; - "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; - "tqt3") PKGRUNTIME="${lib}tqt3-mt";; - "tqtinterface") PKGRUNTIME="${lib}tqt4";; + "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";; + "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; + "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; + "digikam") PKGRUNTIME="digikam-i18n";; + "esound") PKGRUNTIME="${lib}esd0";; + "imlib1") PKGRUNTIME="${lib}Imlib1";; + "knetworkmanager8") PKGRUNTIME="knetworkmanager";; + "koffice") PKGRUNTIME="koffice-suite";; + "lcms") PKGRUNTIME="${lib}lcms1";; + "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";; + "libcaldav") PKGRUNTIME="${lib}caldav0";; + "libcarddav") PKGRUNTIME="${lib}carddav0";; + "libkdcraw") PKGRUNTIME="${lib}kdcraw4";; + "libkexiv2") PKGRUNTIME="${lib}kexiv2-5";; + "libkipi") PKGRUNTIME="${lib}kipi0";; + "libr") PKGRUNTIME="${lib}r";; + "mp4v2") PKGRUNTIME="mp4v2";; + "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; + "tqca") PKGRUNTIME="${lib}tqca1";; + "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; + "tqt3") PKGRUNTIME="${lib}tqt3-mt";; + "tqtinterface") PKGRUNTIME="${lib}tqt4";; # Language package: install only French language package - "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";; + "k3b-i18n"|"koffice-i18n"|"tde-i18n") + PKGRUNTIME="${PKGNAME}-French";; # Default case: runtime package has same name as source package - *) PKGRUNTIME="${PKGNAME}";; + *) PKGRUNTIME="${PKGNAME}";; esac # Finally, display the runtime package name. @@ -66,36 +76,43 @@ echo "${PREFIX}${PKGRUNTIME}" if [ -n "${DEVEL}" ]; then # Check if development package is required. case "${PKGCATEGORY}" in - # Applications do NOT have 'devel' package, except K3B. - "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;; + # Applications do NOT have 'devel' package, except K3B, Koffice. + "applications") if [ "${PKGNAME}" != "k3b" ] && [ "${PKGNAME}" != "koffice" ]; then exit 0; fi;; # Extras packages do NOT have 'devel' package, except Akode "extras") if [ "${PKGNAME}" != "akode" ] && [ "${PKGNAME}" != "hk_classes" ]; then exit 0; fi;; esac - + # Some other packags NOT having development package case "${PKGNAME}" in - "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;; - "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;; + "autoconf"|"automake"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;; + "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; esac # Some package have specific development package. case "${PKGNAME}" in - "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";; - "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";; - "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";; - "esound") PKGDEVEL="esound-devel";; - "pan") PKGDEVEL="uulib-devel";; + "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";; + "imlib1") PKGDEVEL="${lib}Imlib-devel";; + "koffice") PKGDEVEL="koffice-devel";; + "lcms") PKGDEVEL="liblcms-devel";; "libart-lgpl") PKGDEVEL="libart_lgpl-devel";; - "libcaldav") PKGDEVEL="${lib}caldav-devel";; - "libcarddav") PKGDEVEL="${lib}carddav-devel";; - "tqca") PKGDEVEL="${lib}tqca-devel";; + "libcaldav") PKGDEVEL="${lib}caldav-devel";; + "libcarddav") PKGDEVEL="${lib}carddav-devel";; + "libkdcraw") PKGDEVEL="${lib}kdcraw-devel";; + "libkexiv2") PKGDEVEL="${lib}kexiv2-devel";; + "libkipi") PKGDEVEL="${lib}kipi-devel";; + "libr") PKGDEVEL="${lib}r-devel";; + "mp4v2") PKGDEVEL="${lib}mp4v2-devel";; + "pan") PKGDEVEL="uulib-devel";; + "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; - "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";; + "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; # Default case: development package has same name as runtime package, plus '-devel' suffix. - *) PKGDEVEL="${PKGRUNTIME}-devel";; + *) PKGDEVEL="${PKGRUNTIME}-devel";; esac # Finally, other packages do have a '-devel' echo "${PREFIX}${PKGDEVEL}" fi - diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index b52c023e8..2e30edc9b 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,21 +1,36 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-14.0.0}" +TDE_VERSION="${2:-14.0.5}" +DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECDIR="${SPECFILE%/*}" +RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" [ ! -r "${SPECFILE}" ] && exit 2 while read var val; do case "${var}" in + Version:*) VERSION="${val}";; Source[0-9]*:|Source:|Patch[0-9]*:) - FILE=$(rpm -E "${SPECDIR}/${val##*/}") - if [ -r "${FILE}" ]; then - echo "${FILE}" + FILE="${SPECDIR}/${val##*/}" + if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then + FILES="${FILE//%\{?dist\}/.}"* + else + FILES="${FILE}" fi + + for FILE in $FILES; do + file=$(rpm --define "tde_pkg ${PKGNAME}" \ + --define "tde_version ${TDE_VERSION}" \ + --define "name ${RPMPKGNAME}" \ + --define "version ${VERSION}" \ + --define "dist ${DIST:-$(rpm -E %dist)}" \ + -E "${FILE}") + [ -r "${file}" ] && echo "${file}" + done ;; esac done < "${SPECFILE}" diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index 82c61dcd8..fc3b1e085 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -12,7 +12,8 @@ SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) VERSION=$(sed -n "/^Version:/ s/Version:[ ]*//p" ${SPECFILE}) RELEASE=$(sed -n "/^Release:/ s/Release:[ ]*//p" ${SPECFILE}) VERSION=$(rpm -E "${VERSION}") -RELEASE=$(rpm -E "${RELEASE}") +VERSION=$(rpm --define "tde_version ${TDE_VERSION}" -E "${VERSION}") +RELEASE=$(rpm --define "tde_version ${TDE_VERSION}" -E "${RELEASE}") RELEASE=${RELEASE%$(rpmdist.sh --dist)} echo ${VERSION}-${RELEASE} diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index 70ff8d144..b7336ffcc 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -6,25 +6,29 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging -[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat +[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat # Special case for QT3 if [ "${PKGNAME}" = "qt3" ]; then case "$(rpmdist.sh --dist)" in - .oss*) DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/opensuse ;; - .mga*|.mdk*|.pclos*) DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/mageia ;; + .oss*) DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/opensuse" ;; + .mga*|.mdk*|.pclos*) DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/mageia" ;; esac fi -SPECFILE=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-${TDE_VERSION}.spec") -if [ ! -r "${SPECFILE}" ]; then - SPECFILE=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}.spec") - if [ ! -r "${SPECFILE}" ]; then - SPECFILE=$(find "${DIST_PACKAGING_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}.spec") - if [ ! -r "${SPECFILE}" ]; then - SPECFILE=$(find "${DIST_PACKAGING_DIR}" -name "trinity-${PKGNAME}.spec") - fi +for filename in \ + "${PKGNAME}-${TDE_VERSION}.spec" \ + "${PKGNAME}-14.0.0.spec" \ + "${PKGNAME}.spec" \ + "trinity-${PKGNAME}-${TDE_VERSION}.spec" \ + "trinity-${PKGNAME}-14.0.0.spec" \ + "trinity-${PKGNAME}.spec" \ +; do + SPECFILE="$(find "${DIST_PACKAGING_DIR}" -follow -name "${filename}")" + if [ -r "${SPECFILE}" ]; then + echo "${SPECFILE}" + exit 0 fi -fi +done -echo ${SPECFILE} +exit 1 diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 93e2b5036..5deece1bd 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -10,6 +10,8 @@ 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" 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 5f9a442a7..2054957e4 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -10,13 +10,13 @@ RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" # If package version contains a "~": it's a pre-release if [ "${BUILT/\~/}" != "${BUILT}" ]; then if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi # Nominal case: no "~" caracter else - if [ "${TARBALL%-*}" = "${BUILT%-*}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then + echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi fi diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 685fa7a05..7923eca50 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -8,8 +8,9 @@ TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION}) # Package containing "~" (e.g. R14 preversion tarballs): -if [ "${INSTALLED/\~/}" != "${INSTALLED}" ]; then - if [ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then +if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then + # Only compare the part after '~' + if [ "${INSTALLED##*_}" = "${TARBALL#*\~}" ] ||[ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then echo "Latest package '${PKGNAME}' version '${TARBALL}' is already built and installed." exit 0 fi @@ -21,7 +22,7 @@ else fi # Other package (e.g. QT3) - if [ "${INSTALLED}" = "${SPEC}" ]; then + if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." exit 0 fi diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 72ccbf453..f890bfb2e 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -7,7 +7,7 @@ DIST="" if [ -r /etc/redhat-release ]; then read a b c d e f g < /etc/redhat-release -elif [ -r /etc/SuSE-release ]; then +elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -q "opensuse" "/etc/os-release"; then a="opensuse" fi @@ -39,10 +39,19 @@ case $a in Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";; # Opensuse opensuse) - DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" + if [ -r "/etc/SuSE-release" ]; then + DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" + elif [ -r "/etc/SUSE-brand" ]; then + DIST=".oss$((read a; read a b c; echo ${c//./}) </etc/SUSE-brand)" + elif grep -q "tumbleweed" "/etc/os-release"; then + DIST=".osstw" + else + DIST=".oss" + fi ;; # PCLinuxOS PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";; + #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";; *) echo "distrib non reconnue !! $a";; esac diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index 51b6dc7c6..fc1073bfa 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -17,16 +17,18 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) if [ -x /usr/sbin/urpmi ]; then REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' +elif [ -x /usr/bin/dnf ]; then + REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")' elif [ -x /usr/bin/zypper ]; then REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' elif [ -x /usr/bin/yum ]; then if [ "$(rpm -E %dist)" = ".el5" ]; then - REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' else - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' fi elif [ -x /usr/bin/apt-get ]; then - REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)' + REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' fi eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1 diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 91a78b746..02f4e19f8 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -3,8 +3,8 @@ # This file can be sourced in your .bashrc TDE_BASEDIR=~/tde -TDE_VERSION=14.0.0 -TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14 +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +TDE_GITBASESRC=${TDE_BASEDIR}/tde_master TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION} @@ -19,7 +19,7 @@ export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )" alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' # Build a single tarball (execute from GIT directory) -alias tdp4='TARGET=14.0.0 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' +alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' # Rebuild all tarballs if [ -x /usr/bin/pigz ]; then @@ -28,7 +28,7 @@ else export TDE_COMPRESS=gzip fi alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' -alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' +alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' # Build a single package alias cdp='cd ~/tde/tde-packaging/redhat' @@ -38,17 +38,17 @@ grp3() { } grp4() { - build_rpm_package.sh "${1}" "14.0.0" + build_rpm_package.sh "${1}" "${TDE_VERSION}" } # Check if tarballs are more recent than installed packages checknew() { - find ~/tde/tde-tarballs/14.0.0 -name "trinity-*.tar.gz" | while read f; do + find ~/tde/tde-tarballs/${TDE_VERSION} -name "trinity-*.tar.gz" | while read f; do TAR="${f##*/}" NAME="${TAR%-*}" if rpm -q "${NAME}" &>/dev/null; then - set $(rpm -q --qf "%{name} 14.0.0 %{release}" ${NAME} ) + set $(rpm -q --qf "%{name} ${TDE_VERSION} %{release}" ${NAME} ) B="$1-$2~${3#*_}" A=${TAR%.tar.gz} B=${B%.opt} @@ -83,10 +83,10 @@ do_optimizegraphics() { done < submodules } -alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"' +alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort' # Update main repository -alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)' +alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_master; ./scripts/switch_all_submodules_to_head_and_clean)' # Build local repository metadata (Mageia) alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec new file mode 100644 index 000000000..f4b24e33a --- /dev/null +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -0,0 +1,365 @@ +# +# spec file for package akode (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_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/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libakode %{_lib}akode +%else +%define libakode libakode +%endif + +Name: trinity-akode +Epoch: %{tde_epoch} +Version: 2.0.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Audio-decoding framework +Group: System Environment/Libraries +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: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: cmake >= 2.8 +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 +%ifarch %{ix86} x86_64 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%define _with_libmad --with-libmad +BuildRequires: libmad-devel +%endif +%endif + +# ALSA support +%if 0%{?suse_version} +BuildRequires: alsa-devel +%else +BuildRequires: alsa-lib-devel +%endif + +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/* +%{_bindir}/akodeplay +%{_libdir}/libakode.so.* +%{_libdir}/libakode_alsa_sink.la +%{_libdir}/libakode_alsa_sink.so +%{_libdir}/libakode_mpc_decoder.la +%{_libdir}/libakode_mpc_decoder.so +%{_libdir}/libakode_oss_sink.la +%{_libdir}/libakode_oss_sink.so +%{_libdir}/libakode_xiph_decoder.la +%{_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: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_pulseaudio:Requires: %{libakode}_pulse_sink = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libmad:Requires: %{libakode}_mpeg_decoder = %{?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,-) +%{_bindir}/akode-config +%{_includedir}/* +%{_libdir}/libakode.la +%{_libdir}/libakode.so +%{_libdir}/pkgconfig/akode.pc + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +########## + +%if "%{?_with_jack}" != "" + +%package -n %{libakode}_jack_sink +Summary: Jack audio output backend for %{name} +Group: Development/Libraries +Provides: libakode_jack_sink = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_jack_sink +This package contains the Jack audio output backend for Akode. + +%files -n %{libakode}_jack_sink +%defattr(-,root,root,-) +%{_libdir}/libakode_jack_sink.la +%{_libdir}/libakode_jack_sink.so + +%post -n %{libakode}_jack_sink +/sbin/ldconfig + +%postun -n %{libakode}_jack_sink +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_pulseaudio}" != "" + +%package -n %{libakode}_pulse_sink +Summary: Pulseaudio output backend for %{name} +Group: Development/Libraries +Provides: libakode_pulse_sink = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_pulse_sink +This package contains the pulseaudio backend for Akode. +Recommended for network transparent audio. + +%files -n %{libakode}_pulse_sink +%defattr(-,root,root,-) +%{_libdir}/libakode_pulse_sink.la +%{_libdir}/libakode_pulse_sink.so + +%post -n %{libakode}_pulse_sink +/sbin/ldconfig + +%postun -n %{libakode}_pulse_sink +/sbin/ldconfig + +%endif + +########## + +# Packaged separately to keep main/core %{akode} package LGPL-clean. +%if "%{?_with_libsamplerate:1}" == "1" + +%package -n %{libakode}_src_resampler +Summary: Resampler based on libsamplerate for %{name} +Group: Development/Libraries +Provides: libakode_src_resampler = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_src_resampler +This package contains the samplerate decoder for Akode. + +%files -n %{libakode}_src_resampler +%defattr(-,root,root,-) +%{_libdir}/libakode_src_resampler.la +%{_libdir}/libakode_src_resampler.so + +%post -n %{libakode}_src_resampler +/sbin/ldconfig + +%postun -n %{libakode}_src_resampler +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_libmad}" != "" + +%package -n %{libakode}_mpeg_decoder +Summary: Decoder based on libmad for %{name} +Group: Development/Libraries +Provides: libakode_mpeg_decoder = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_mpeg_decoder +This package contains the mad decoder for Akode. + +%files -n %{libakode}_mpeg_decoder +%defattr(-,root,root,-) +%{_libdir}/libakode_mpeg_decoder.la +%{_libdir}/libakode_mpeg_decoder.so + +%post -n %{libakode}_mpeg_decoder +/sbin/ldconfig + +%postun -n %{libakode}_mpeg_decoder +/sbin/ldconfig + +%endif + +########## + +%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} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_LIBLTDL="OFF" \ + -DWITH_ALSA_SINK="ON" \ + %{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \ + %{!?_with_pulseaudio:-DWITH_PULSE_SINK="OFF"} %{?_with_pulseaudio:-DWITH_PULSE_SINK="ON"} \ + -DWITH_OSS_SINK="ON" \ + -DWITH_SUN_SINK="OFF" \ + \ + -DWITH_FFMPEG_DECODER="OFF" \ + -DWITH_MPC_DECODER="ON" \ + %{!?_with_libmad:-DWITH_MPEG_DECODER="OFF"} %{?_with_libmad:-DWITH_MPEG_DECODER="ON"} \ + -DWITH_SRC_RESAMPLER="ON" \ + -DWITH_XIPH_DECODER="ON" \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +# 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-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec new file mode 100644 index 000000000..3a3ef35df --- /dev/null +++ b/redhat/dependencies/akode/akode-3.5.13.2.spec @@ -0,0 +1,350 @@ +# +# 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/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 244c370e3..765d14efa 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package arts (version R14.0.0) +# spec file for package arts (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg arts %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -35,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ @@ -62,6 +60,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} @@ -79,18 +78,17 @@ BuildRequires: libvorbis-devel # ESOUND support %define with_esound 1 +%if 0%{?with_esound} BuildRequires: esound-devel +%endif # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_jack 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel %{_lib}jack-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif BuildRequires: %{jack_devel} @@ -98,7 +96,7 @@ BuildRequires: %{jack_devel} # LIBTOOL %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel +BuildRequires: libltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libtool-ltdl-devel @@ -115,10 +113,7 @@ BuildRequires: libtool %ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -%define mad_devel %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion} %define mad_devel libmad-devel %endif BuildRequires: %{mad_devel} @@ -169,12 +164,6 @@ playing a wave file with some effects. # The '.la' files are needed for runtime, not devel ! %{tde_libdir}/lib*.la -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - ########## %package devel @@ -188,7 +177,7 @@ Obsoletes: arts-devel Requires: alsa-lib-devel Requires: audiofile-devel Requires: libvorbis-devel -Requires: esound-devel +%{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} %{?with_jack:Requires: %{jack_devel}} @@ -216,12 +205,6 @@ playing a wave file with some effects. %{tde_libdir}/pkgconfig/*.pc %{tde_libdir}/*.a -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?with_pulseaudio} @@ -237,7 +220,7 @@ intended for systems running the Pulseaudio server. %files config-pulseaudio %defattr(-,root,root,-) -%{tde_datadir}/config/kcmartsrc +%{tde_confdir}/kcmartsrc %endif @@ -299,13 +282,14 @@ fi # Installs the Pulseaudio configuration file %if 0%{?with_pulseaudio} -cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc" +%__mkdir_p "%{?buildroot}%{tde_confdir}" +cat <<EOF >"%{?buildroot}%{tde_confdir}/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" +chmod 644 "%{?buildroot}%{tde_confdir}/kcmartsrc" %endif # Add supplementary folders @@ -317,5 +301,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.5.10-2 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec index ad8473da4..02e031f9e 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -29,21 +29,17 @@ %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 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +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/ @@ -62,6 +58,8 @@ 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} @@ -83,25 +81,22 @@ BuildRequires: esound-devel # JACK support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} %define with_jack 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel %{_lib}jack-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif BuildRequires: %{jack_devel} %endif # LIBTOOL -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif %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 @@ -110,16 +105,14 @@ 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 -%if 0%{?mdkversion} || 0%{?mgaversion} -%define mad_devel %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define mad_devel libmad-devel -%endif BuildRequires: %{mad_devel} %endif %endif @@ -250,6 +243,7 @@ intended for systems running the Pulseaudio server. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%{?tde_patch:%patch1 -p1} %build @@ -316,15 +310,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2 -- Rebuild. - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/dependencies/arts/trinity-arts-rpmlintrc b/redhat/dependencies/arts/trinity-arts-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 41d6c5f7f..1989ceb7b 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package avahi-tqt (version R14.0.0) +# spec file for package avahi-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libavahi %{_lib}avahi @@ -29,7 +31,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -50,13 +52,31 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake 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 @@ -70,7 +90,7 @@ BuildRequires: libcap-devel # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel %{_lib}avahi-client-devel +%define avahi_devel libavahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -170,6 +190,7 @@ into a TQt main loop application. %files -n %{libavahi}-tqt-devel %defattr(-,root,root,-) %{_includedir}/avahi-tqt/ +%{_libdir}/libavahi-tqt.a %{_libdir}/libavahi-tqt.so %{_libdir}/libavahi-tqt.la %{_libdir}/pkgconfig/avahi-tqt.pc @@ -184,40 +205,31 @@ into a TQt main loop application. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -export NOCONFIGURE=1 -./autogen.sh %build unset QTDIR QTINC QTLIB -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 + +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 \ + .. %__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean @@ -225,5 +237,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1 -- Initial release for TDE 14.0.0 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 index 8ecd7f82c..c9e7121e6 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,7 +29,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -54,9 +54,26 @@ 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 @@ -70,7 +87,7 @@ BuildRequires: libcap-devel # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel %{_lib}avahi-client-devel +%define avahi_devel libavahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -176,7 +193,7 @@ into a TQt main loop application. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -226,8 +243,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-2 -- Rename package to 'libavahi-tqt' - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index f83aba4d6..7f8d9f3cb 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-tqt (version R14.0.0) +# spec file for package dbus-1-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus @@ -29,7 +31,7 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -112,6 +114,12 @@ 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} +%if 0%{?suse_version} +Requires: dbus-1-devel +%else +Requires: dbus-devel +%endif + %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 @@ -181,5 +189,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9-1 -- Initial release for TDE R14.0.0 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 index ce1fa478c..8e4771767 100644 --- 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 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,8 +29,8 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: dbus bindings for the Trinity Qt [TQt] interface +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} +Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -74,7 +74,7 @@ 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 +Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -104,7 +104,7 @@ See the dbus description for more information about D-BUS in general. ########## %package -n %{libdbus}-1-tqt-devel -Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files) +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} @@ -137,7 +137,7 @@ See the dbus description for more information about D-BUS in general. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -181,11 +181,3 @@ fi %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.9-2 -- Rename package to 'libdbus-1-tqt' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index 7f63f8bae..75ec11785 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-tqt (version R14.0.0) +# spec file for package dbus-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus @@ -29,7 +31,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -113,6 +115,12 @@ 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} +%if 0%{?suse_version} +Requires: dbus-1-devel +%else +Requires: dbus-devel +%endif + %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 @@ -181,5 +189,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.63-1 -- Initial release for TDE R14.0.0 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 index f61010da4..81ec5d368 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,7 +29,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -192,11 +192,3 @@ fi %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.63-2 -- Rename package to 'libdbus-tqt-1' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index 3f4acc2fd..cd8a9ebc2 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libart-lgpl (version R14.0.0) +# spec file for package libart-lgpl (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,13 +12,15 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libart %{_lib}art @@ -27,12 +29,13 @@ %endif -Name: trinity-libart-lgpl -Version: 2.3.22 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: Library of functions for 2D graphics -Group: System/Libraries -URL: http://www.trinitydesktop.org/ +Name: trinity-libart-lgpl +Epoch: %{tde_epoch} +Version: 2.3.22 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Library of functions for 2D graphics +Group: System/Libraries +URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} License: LGPL-2.0+ @@ -93,8 +96,8 @@ especially suitable for embedded applications. %package -n %{libart}_lgpl-devel Summary: Library of functions for 2D graphics - development files Group: Development/Libraries -Provides: libart_lgpl-devel = %{version}-%{release} -Requires: %{libart}_lgpl_2-2 = %{version}-%{release} +Provides: libart_lgpl-devel = %{tde_epoch}:%{version}-%{release} +Requires: %{libart}_lgpl_2-2 = %{tde_epoch}:%{version}-%{release} %description -n %{libart}_lgpl-devel A library of functions for 2D graphics supporting a superset of the @@ -175,7 +178,7 @@ especially suitable for embedded applications. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" autoreconf -fiv @@ -206,5 +209,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 386e92fbc..a4bf7ebb2 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcaldav (version R14.0.0) +# spec file for package libcaldav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -52,6 +54,8 @@ 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: make BuildRequires: libtool BuildRequires: fdupes @@ -65,15 +69,10 @@ BuildRequires: gtk2-devel %endif # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define libcurl_devel libcurl-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel libcurl-devel >= 7.15.5 %else -# Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel curl-devel >= 7.15.5 %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -152,7 +151,10 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -./autogen.sh +%if 0%{?rhel} == 5 +%patch1 -p1 -b .ftbfs +%endif +autoreconf -fiv %build @@ -193,6 +195,4 @@ mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{ver %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.5-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch new file mode 100644 index 000000000..0cf9f056b --- /dev/null +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch @@ -0,0 +1,193 @@ +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 index 4ff94304e..419ff8ff9 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +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/ @@ -65,15 +65,11 @@ BuildRequires: gtk2-devel %endif # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define libcurl_devel libcurl-devel %else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel -%else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel trinity-libcurl-devel %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -196,16 +192,4 @@ mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/l %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2 -- Add missing BuildRequires - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index c02b79769..27e23795e 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcarddav (version R14.0.0) +# spec file for package libcarddav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -52,19 +54,17 @@ 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: make BuildRequires: libtool # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define libcurl_devel libcurl-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel libcurl-devel >= 7.15.5 %else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel curl-devel >= 7.15.5 %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -151,11 +151,14 @@ 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 -./autogen.sh +autoreconf -fiv %build @@ -191,6 +194,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.2-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch new file mode 100644 index 000000000..a6bf4e6e0 --- /dev/null +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch @@ -0,0 +1,164 @@ +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 index d09b0fed7..152f1cf90 100644 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -56,15 +56,11 @@ BuildRequires: make BuildRequires: libtool # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define libcurl_devel libcurl-devel %else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel -%else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel trinity-libcurl-devel %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -151,6 +147,7 @@ This package contains the development files. %prep %setup -q -n libcarddav-%{version} +%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/" autoreconf --force --install --symlink @@ -195,13 +192,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/dependencies/libr/libr.spec b/redhat/dependencies/libr/libr.spec new file mode 100644 index 000000000..ba6ed625a --- /dev/null +++ b/redhat/dependencies/libr/libr.spec @@ -0,0 +1,180 @@ +# +# 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-14.0.0.spec index 000b00936..3b8b54d68 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tqt (version R14.0.0) +# spec file for package python-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -23,7 +23,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg python-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -36,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.18.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt bindings for Python Group: Development/Libraries/Python URL: http://www.trinitydesktop.org/ @@ -265,5 +262,3 @@ echo yes | %__python ../configure.py \ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.18.1-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch new file mode 100644 index 000000000..09d697fb4 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch @@ -0,0 +1,15 @@ +--- 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() ) ); */ + } + } + } diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch new file mode 100644 index 000000000..009ab81fb --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch @@ -0,0 +1,11 @@ +--- 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" diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch new file mode 100644 index 000000000..5bd5e9e0a --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch @@ -0,0 +1,18 @@ +--- 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 --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch @@ -0,0 +1,15 @@ +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) { diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch new file mode 100644 index 000000000..84b885b8b --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..01f3824c1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- 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:"); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 100644 index 000000000..8dbb2ae98 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1,11 @@ +--- 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 --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..eb880b1cc --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch @@ -0,0 +1,12 @@ +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 ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 100644 index 000000000..eb3868c96 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch new file mode 100644 index 000000000..41a74fba7 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch @@ -0,0 +1,23 @@ +--- 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; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 100644 index 000000000..7583239cc --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch new file mode 100644 index 000000000..02a40b225 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- 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."; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch new file mode 100644 index 000000000..6dce7aa80 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch @@ -0,0 +1,14 @@ +--- 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 + diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch new file mode 100644 index 000000000..0d03f0809 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1,11 @@ +--- 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; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 100644 index 000000000..a9cfaf4c3 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1,11 @@ +--- 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 } + }; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..ee960442e --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- ./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 ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch new file mode 100644 index 000000000..efc24c8a1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1,36 @@ +--- 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 diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch new file mode 100644 index 000000000..f2351909f --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch @@ -0,0 +1,14 @@ +--- 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", diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch new file mode 100644 index 000000000..c1ff66c2c --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1,11 @@ +--- 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 --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch new file mode 100644 index 000000000..341cab7e1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch @@ -0,0 +1,24 @@ +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"; diff --git a/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch new file mode 100644 index 000000000..0c93c416a --- /dev/null +++ b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1,25 @@ +--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 +@@ -315,9 +315,9 @@ + QString bloat. However, gcc 3.4 doesn't allow us to create references to + members of a packed struct. (Pointers are OK, because then you + supposedly know what you are doing.) */ +-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) ++# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) + # define Q_PACKED __attribute__ ((packed)) +-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ++# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + # define Q_NO_PACKED_REFERENCE + # endif + # endif +--- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 +@@ -194,7 +194,7 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort *)&ucs); } + #else + ushort &unicode() { return ucs; } + #endif diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.patch b/redhat/dependencies/qt3/qt3-3.5.13.2.patch new file mode 100644 index 000000000..6c9a6f8f0 --- /dev/null +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.patch @@ -0,0 +1,516 @@ +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 index 0c4d25c81..b997dd9ec 100644 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec @@ -10,7 +10,12 @@ # 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} @@ -20,13 +25,10 @@ License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries URL: http://www.trinitydesktop.org/ -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - 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 @@ -35,31 +37,8 @@ Source5: assistant3.desktop Source6: linguist3.desktop Source7: qtconfig3.desktop -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch +# 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} @@ -135,21 +114,71 @@ 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: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release} -%endif +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: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: freetype-devel Requires: fontconfig-devel Requires: libpng-devel @@ -172,87 +201,6 @@ Requires: xorg-x11-proto-devel Requires: mesa-libGL-devel Requires: mesa-libGLU-devel %endif -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%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 - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release} -%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. - - -%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. - %description devel The %{name}-devel package contains the files necessary to develop @@ -262,66 +210,149 @@ 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 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif +%patch1 -p1 -# upstream patches -%patch200 -p1 -b .fullscreen # convert to UTF-8 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ @@ -493,13 +524,13 @@ for a in */*/Makefile ; do 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 +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 +mkdir -p "%{buildroot}%{_datadir}/applications" desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ + --dir "%{buildroot}%{_datadir}/applications" \ --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} @@ -514,145 +545,17 @@ mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf # install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png +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 +mkdir -p "%{buildroot}%{qtdir}/plugins/styles" + %clean rm -rf %{buildroot} -%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.* - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%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 - - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-10 -- Initial release for TDE 3.5.13.2 - -* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9 -- Initial release for TDE 3.5.13.1 - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8 -- Fix Provides and Obsoletes, again and again ... - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7 -- Fix Provides and Obsoletes. Now only for RHEL 5. - -* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6 -- Fix Qt3 builds with libpng15. [Bug #683] - -* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5 -- Fix 'Provides' AGAIN !! [Bug #823] - -* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4 -- Fix 'Provides' [Bug #823] - -* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec index 7e10966e9..6432e8099 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package sip4-tqt (version R14.0.0) +# spec file for package sip4-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -27,7 +27,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -40,18 +42,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %{!?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} Version: 4.10.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Python/C++ bindings generator runtime library Group: Development/Tools/Building URL: http://www.trinitydesktop.org/ @@ -175,5 +172,3 @@ cd build %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:4.10.5-1 -- Initial release for TDE R14 diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index d078dee46..0323731dc 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca-tls (version R14.0.0) +# spec file for package tqca-tls (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ @@ -114,5 +116,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1 -- Initial release for TDE 14.0.0 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 index 808415d93..8892b1ec2 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -24,16 +24,16 @@ %define tde_libdir %{tde_prefix}/%{_lib} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqt3 %{_lib}tqt3 +%define libtqt3 %{_lib}qt3 %else -%define libtqt3 libtqt3 +%define libtqt3 libqt3 %endif Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ @@ -120,11 +120,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Renames TQCA to QCA in source code - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 4360cd56c..a6e59e772 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca (version R14.0.0) +# spec file for package tqca (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -148,12 +150,18 @@ unset QTDIR QTINC QTLIB --qtdir=/usr \ --debug + +# Workaround strange tqmake behaviour in RHEL5 +%if 0%{?rhel} == 5 +%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" +%endif + %__make %{?_smp_mflags} %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT=$RPM_BUILD_ROOT +%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" %clean @@ -161,5 +169,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index 2c6567fd3..629131436 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -162,11 +162,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Renames TQCA to QCA in source code - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index b8c7e0690..b9d293309 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqscintilla (version R14.0.0) +# spec file for package tqscintilla (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqscintilla %define tde_prefix /opt/trinity %define tde_datadir %{tde_prefix}/share @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.7.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt source code editing component based on Scintilla Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -172,6 +174,11 @@ export QTDIR=%{_libdir}/tqt3 unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +# Workaround strange tqmake behaviour in RHEL5 +%if 0%{?rhel} == 5 +%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g" +%endif + %__make %{?_smp_mflags} -C qt %__make %{?_smp_mflags} -C designer @@ -186,29 +193,28 @@ export QTDIR=%{_libdir}/tqt3 # Installs supplementary headers for i in include/*.h; do - %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/} + %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/} done # Installs the HTML documentation correctly for i in doc/html/*; do - %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/} + %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/} done # Installs the Designer plugin -for i in designer/*.so; do - %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} +for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do + [ -r "${i}" ] || continue + %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} done # Installs libraries %__mkdir_p %{buildroot}%{_libdir} %__mv -f tmplib/* %{buildroot}%{_libdir} - # Fix private headers location %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla - # Fix permissions chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h @@ -219,5 +225,3 @@ chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.7.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 893e10952..dda0eb54c 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqt3 (version R14.0.0) +# spec file for package tqt3 (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,11 +12,13 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt3 %{_lib}tqt3 @@ -27,7 +29,7 @@ Name: trinity-tqt3 Version: 3.5.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt GUI Library, Version 3 Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -109,15 +111,10 @@ BuildRequires: cups-devel %{?uuid_devel:BuildRequires: %{uuid_devel}} # LIBAUDIO support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%define with_nas 1 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_nas 1 %define libaudio_devel nas-devel %endif -%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%define libaudio_devel libaudio-devel -%endif -%endif %{?libaudio_devel:BuildRequires: %{libaudio_devel}} # Xrender support @@ -134,8 +131,12 @@ BuildRequires: cups-devel %define xrandr_devel libXrandr-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define xrandr_devel %{_lib}xrandr2-devel +%else %define xrandr_devel libxrandr-devel %endif +%endif %{?xrandr_devel:BuildRequires: %{xrandr_devel}} # Xcursor support @@ -225,7 +226,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %define xi_devel xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xi_devel %{_lib}xi-devel +%define xi_devel libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} %define xi_devel libXi-devel @@ -246,8 +247,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: MesaGLU-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -262,6 +267,11 @@ BuildRequires: unixODBC-devel # SQLITE support BuildRequires: sqlite-devel +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%endif + # POSTGRESQL support BuildRequires: postgresql BuildRequires: postgresql-devel @@ -272,6 +282,24 @@ BuildRequires: postgresql-devel BuildRequires: firebird-devel %endif +# FBCLIENT support +%if 0%{?mgaversion} >= 6 +BuildRequires: %{_lib}fbclient-devel +%endif + +# NIS support +%define with_nis 1 + +# RPC support +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 +%if 0%{?fedora} +BuildRequires: libnsl2-devel +%else +BuildRequires: libnsl-devel +%endif +BuildRequires: libtirpc-devel +%endif + # x86_64 specific stuff %if "%{_lib}" != "lib" %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) @@ -1250,7 +1278,12 @@ things that are possible with TQt3. # Fix strange FTBFS on RHEL5 %if 0%{?rhel} == 5 -%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" +%__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 @@ -1291,6 +1324,8 @@ for d in \ %{_includedir}/Xft2/X11/Xft \ %{_includedir}/mysql \ %{_includedir}/libpng15 \ + %{_includedir}/libpng16 \ + %{_includedir}/tirpc \ ; do if [ -d "${d}" ]; then INCDIRS="${INCDIRS} -I${d}" @@ -1332,7 +1367,7 @@ echo yes | ./configure \ -platform linux-g++ \ %endif \ - -nis \ + %{?with_nis:-nis} %{?!with_nis:-no-nis} \ -no-pch \ -cups \ -stl \ @@ -1504,5 +1539,3 @@ chmod 644 "%{?buildroot}%{_datadir}/tqt3/mkspecs/"*/* %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 8b71f3508..09c1cab1d 100755..100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqtinterface (version R14.0.0) +# spec file for package tqtinterface (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,15 +21,12 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -69,10 +66,26 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig +# UUID support +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define uuid_devel libuuid-devel +%endif +%if 0%{?rhel} == 5 +%define uuid_devel e2fsprogs-devel +%endif +%{?uuid_devel:BuildRequires: %{uuid_devel}} + + # PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: pth-devel %endif +%if 0%{?fedora} && 0%{?fedora} <= 26 +BuildRequires: pth-devel +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1500 +BuildRequires: libpth-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -92,7 +105,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel +BuildRequires: libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -257,5 +270,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index dd8704c7d..127e0b908 100755..100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -25,11 +25,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +34,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -69,6 +64,9 @@ 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 @@ -92,7 +90,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel +BuildRequires: libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -152,6 +150,7 @@ 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 @@ -269,11 +268,3 @@ done %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-3 -- Rename package to 'libtqt4' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh new file mode 100755 index 000000000..9aeb60f5a --- /dev/null +++ b/redhat/docker/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +DISTRIB="$1" +TDE_VERSION="$2" +ARCH="$3" + +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${ARCH}" ] && ARCH="x86_64" + +IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" + +#docker rmi -f "${IMAGE}" +docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}" diff --git a/redhat/docker/centos32.sh b/redhat/docker/centos32.sh new file mode 100755 index 000000000..afbb25a7f --- /dev/null +++ b/redhat/docker/centos32.sh @@ -0,0 +1,50 @@ +#!/bin/bash -ex + +[ "$(whoami)" = "root" ] || exec sudo $0 $@ +[ "$(rpm -E %_arch)" = "x86_64" ] && exec setarch i686 $0 $@ + +cd "$(dirname "$0")" + +NAME="centos32" +VERSION="$1" # E.g: '5' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" +DIR="el${VERSION}" + +REPO="centos-${VERSION}" + +# Installation minimale de la distribution +rm -rf "${INSTALLROOT}" +install -m 644 "${DIR}/${REPO}.repo" "/etc/yum.repos.d" +yum install --disablerepo="*" --enablerepo="${REPO}*" --nogpgcheck --releasever="${VERSION}" -y --installroot "${INSTALLROOT}" libselinux yum yum-plugin-ovl +rm -f "/etc/yum.repos.d/${REPO}.repo" +touch "${INSTALLROOT}/etc/fstab" "${INSTALLROOT}/etc/mtab" + +# Activation des dépôts YUM de l'atelier DEPL-IT (remplace les dépôts Internet) +rm -f "${INSTALLROOT}/etc/yum.repos.d/"*".repo" +install -m 644 "${DIR}/${REPO}.repo" "${INSTALLROOT}/etc/yum.repos.d" +install -m 644 "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf" +rm -f "${INSTALLROOT}/etc/group" "${INSTALLROOT}/etc/passwd" "${INSTALLROOT}/etc/pam.d/system-auth" "${INSTALLROOT}/usr/share/info/dir" + +# Ré-installation de la distribution en utilisant le "yum" intégré +rm -rf "${INSTALLROOT}/var/lib/rpm/"* +install -m 644 "${DIR}/"{epel,repoforge}*".repo" "${INSTALLROOT}/etc/yum.repos.d" +cp -a "/dev/urandom" "${INSTALLROOT}/dev/urandom" +chroot "${INSTALLROOT}" yum install --nogpgcheck -y $(<${DIR}/packages.base) +find "${INSTALLROOT}" -name "*.rpmnew" -delete + +# Création de l'image Tar +tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +rm -rf "${INSTALLROOT}" + +# Création de l'image Docker +if [ "$(docker images -q "${IMAGE}")" != "" ]; then + docker rmi -f "${IMAGE}" +fi +docker import "${IMAGE}.tar" "${IMAGE}" + +# Test de l'image +docker run "${IMAGE}" yum repolist + + +exit 0 diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 new file mode 100644 index 000000000..8b6cbf724 --- /dev/null +++ b/redhat/docker/el5/Dockerfile.i686 @@ -0,0 +1,32 @@ +FROM centos32:5 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=i686 + +# Add local repositories +RUN rm -f /etc/yum.repos.d/*.repo +ADD centos-5.repo /etc/yum.repos.d/centos-5.repo +ADD epel-5.repo /etc/yum.repos.d/epel-5.repo +ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo + +# Install Trinity build dependencies +ADD packages.trinity /etc/yum.repos.d/packages +#RUN yum install -y setarch +RUN setarch ${ARCH} yum update -y +RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || : + +# Avoid conflict with gnome-screensaver +RUN setarch ${ARCH} yum remove -y gnome-screensaver +RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver + +# 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" + +# 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 + +# 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|" diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 new file mode 100644 index 000000000..84a626539 --- /dev/null +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -0,0 +1,33 @@ +FROM centos:5 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add local repositories +RUN rm -f /etc/yum.repos.d/*.repo +ADD centos-5.repo /etc/yum.repos.d/centos-5.repo +ADD epel-5.repo /etc/yum.repos.d/epel-5.repo +ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo + +# Install Trinity build dependencies +ADD packages.trinity /etc/yum.repos.d/packages +RUN echo "multilib_policy=best" >>"/etc/yum.conf" +RUN yum install -y setarch +RUN setarch ${ARCH} yum update -y +RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || : + +# Avoid conflict with gnome-screensaver +RUN setarch ${ARCH} yum remove -y gnome-screensaver +RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver + +# 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" + +# 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 + +# 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|" diff --git a/redhat/docker/el5/centos-5.repo b/redhat/docker/el5/centos-5.repo new file mode 100644 index 000000000..135077b21 --- /dev/null +++ b/redhat/docker/el5/centos-5.repo @@ -0,0 +1,30 @@ +[centos-5-base] +name=CentOS-5 - Base +baseurl=http://repo/repo/archives/centos/5/os/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +#released updates +[centos-5-updates] +name=CentOS-5 - Updates +baseurl=http://repo/repo/archives/centos/5/updates/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +#additional packages that may be useful +[centos-5-extras] +name=CentOS-5 - Extras +baseurl=http://repo/repo/archives/centos/5/extras/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 + +#additional packages that extend functionality of existing packages +[centos-5-centosplus] +name=CentOS-5 - Plus +baseurl=http://repo/repo/archives/centos/5/centosplus/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 +enabled=1 diff --git a/redhat/docker/el5/epel-5.repo b/redhat/docker/el5/epel-5.repo new file mode 100644 index 000000000..f110938f8 --- /dev/null +++ b/redhat/docker/el5/epel-5.repo @@ -0,0 +1,5 @@ +[epel] +name=epel +baseurl=http://repo/repo/archives/epel/5/$basearch/ +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el5/packages.base b/redhat/docker/el5/packages.base new file mode 100644 index 000000000..7765aa5df --- /dev/null +++ b/redhat/docker/el5/packages.base @@ -0,0 +1,6 @@ +bash +perl +setarch +vim-enhanced +yum +yum-plugin-ovl diff --git a/redhat/docker/el5/packages.trinity b/redhat/docker/el5/packages.trinity new file mode 100644 index 000000000..da882fb5c --- /dev/null +++ b/redhat/docker/el5/packages.trinity @@ -0,0 +1,199 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +boost-devel +bzip2-devel +ccache +ccrtp-devel +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +commoncpp2-devel +compat-gcc-34-g77 +cpp +cppunit-devel +createrepo +cryptsetup-luks-devel +cups-devel +curl-devel +db4-devel +dbus-glib-devel +dejagnu +doxygen +emacs +esound-devel +exiv2-devel +expect +fdupes +ffmpeg-devel +fftw-devel +flac-devel +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gcc-java +gettext-devel +glib-devel +gmime-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 +heimdal-devel +hspell-devel +htdig +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 +libarchive-devel +libart_lgpl-devel +libcap-devel +libcdio-devel +libdrm-devel +libdvdread-devel +libfontenc-devel +libgcj-devel +libgpod-devel +libgsf-devel +libgssapi-devel +libical-devel +libicu-devel +libidn-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmusicbrainz-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libraw1394-devel +librsvg2-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libtunepimp-devel +libutempter-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 +lm_sensors-devel +meanwhile-devel +mysql-devel +nas-devel +ncurses-devel +neon-devel +netpbm-progs +net-snmp-devel +NetworkManager-glib-devel +ocaml +OpenEXR-devel +openldap-devel +openldap24-libs-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl(ExtUtils::MakeMaker) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +poppler-devel +postgresql-devel +pth-devel +python-docutils +recode +redhat-rpm-config +rpm-build +rsh +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +setarch +sip-devel +speex-devel +sqlite-devel +sudo +subversion-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texinfo-tex +transfig +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xine-lib-devel +xmlto +xorg-x11-font-utils +xorg-x11-server-utils +xscreensaver +xscreensaver-gl-base +xscreensaver-gl-extras +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/docker/el5/repoforge-5.repo b/redhat/docker/el5/repoforge-5.repo new file mode 100644 index 000000000..a08fc0ba4 --- /dev/null +++ b/redhat/docker/el5/repoforge-5.repo @@ -0,0 +1,5 @@ +[dag] +name=dag +baseurl=http://repo/repo/repoforge/redhat/el5/en/$basearch/dag/ +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el5/rpmbuild.repo b/redhat/docker/el5/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el5/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/el5/rpmmacros b/redhat/docker/el5/rpmmacros new file mode 100644 index 000000000..05170915d --- /dev/null +++ b/redhat/docker/el5/rpmmacros @@ -0,0 +1,5 @@ +%dist .el5 +%rhel 5 +%_smp_mflags -j8 +%jobs 8 +%_topdir /home/trinity/rpmbuild diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 new file mode 100644 index 000000000..e8e4dbb8d --- /dev/null +++ b/redhat/docker/el6/Dockerfile.i686 @@ -0,0 +1,30 @@ +FROM centos32:6 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=i686 + +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 + +# Install Trinity build dependencies +ADD packages.trinity /packages +RUN setarch ${ARCH} yum -y update +RUN 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" + +# 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 + +# 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|" diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 new file mode 100644 index 000000000..9b845631f --- /dev/null +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -0,0 +1,30 @@ +FROM centos:6 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=x86_64 + +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 + +# Install Trinity build dependencies +ADD packages.trinity /packages +RUN yum -y update +RUN 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" + +# 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 + +# 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|" diff --git a/redhat/docker/el6/centos-6.repo b/redhat/docker/el6/centos-6.repo new file mode 100644 index 000000000..a00a85ad5 --- /dev/null +++ b/redhat/docker/el6/centos-6.repo @@ -0,0 +1,30 @@ +[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 new file mode 100644 index 000000000..24134a301 --- /dev/null +++ b/redhat/docker/el6/epel-6.repo @@ -0,0 +1,5 @@ +[epel] +name=epel +baseurl=http://repo/repo/epel/6/$basearch/ +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base new file mode 100644 index 000000000..7765aa5df --- /dev/null +++ b/redhat/docker/el6/packages.base @@ -0,0 +1,6 @@ +bash +perl +setarch +vim-enhanced +yum +yum-plugin-ovl diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity new file mode 100644 index 000000000..4ee743b2a --- /dev/null +++ b/redhat/docker/el6/packages.trinity @@ -0,0 +1,208 @@ +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 +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +commoncpp2-devel +cpp +cppunit-devel +createrepo +cryptsetup-luks-devel +cups-devel +db4-devel +dbus-glib-devel +djvulibre +djvulibre-devel +doxygen +e2fsprogs-devel +emacs +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gcc-java +gettext-devel +glib-devel +gmime-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 +heimdal-devel +hspell-devel +htdig +html2ps +icu +ImageMagick-devel +imake +imlib-devel +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.4.2-gcj-compat-devel +java-1.6.0-openjdk-devel +java-1.7.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libarchive-devel +libart_lgpl-devel +libblkid-devel +libcap-devel +libcdio-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libfontenc-devel +libgcj-devel +libgpod-devel +libgsf-devel +libgssapi-devel +libical-devel +libidn-devel +liblo-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libraw1394-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-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 +libXScrnSa +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mysql-devel +nas-devel +neon-devel +netpbm-progs +net-snmp-devel +net-tools +NetworkManager-glib-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-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 +sudo +sword-devel +t1lib-devel +t1utils +taglib-devel +tar +texinfo +texlive-utils +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +ver-devel +wireless-tools-devel +xine-lib-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/docker/el6/repoforge-6.repo b/redhat/docker/el6/repoforge-6.repo new file mode 100644 index 000000000..8747bf2df --- /dev/null +++ b/redhat/docker/el6/repoforge-6.repo @@ -0,0 +1,5 @@ +[dag] +name=dag +baseurl=http://repo/repo/repoforge/redhat/el6/en/$basearch/dag/ +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el6/rpmbuild.repo b/redhat/docker/el6/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el6/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/el6/rpmmacros b/redhat/docker/el6/rpmmacros new file mode 100644 index 000000000..3b33ecbc0 --- /dev/null +++ b/redhat/docker/el6/rpmmacros @@ -0,0 +1,5 @@ +%dist .el6 +%rhel 6 +%_smp_mflags -j8 +%jobs 8 +%_topdir /home/trinity/rpmbuild diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 new file mode 100644 index 000000000..23b191982 --- /dev/null +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -0,0 +1,27 @@ +FROM centos:7 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=x86_64 + +# 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 + +# Install Trinity build dependencies +ADD packages /packages +RUN yum update -y +RUN yum install -y $(</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" + +# 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 + +# 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|" diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages new file mode 100644 index 000000000..60229d64f --- /dev/null +++ b/redhat/docker/el7/packages @@ -0,0 +1,208 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +createrepo +cryptsetup-devel +cups-devel +db4-devel +dbus-glib-devel +djvulibre +djvulibre-devel +doxygen +emacs +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gettext-devel +glib-devel +gmime-devel +gmp-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-devel +hspell-devel +html2ps +icu +ImageMagick-devel +imake +imlib-devel +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.7.0-openjdk-devel +java-devel +java-openjdk +kernel +lame-devel +lcms-devel +libacl-devel +libarchive-devel +libart_lgpl-devel +libassuan-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdvdread-devel +libfontenc-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libksba-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libqalculate-devel +libraw1394-devel +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudisks2-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 +libusb-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mysql-devel +neon-devel +netpbm-progs +net-snmp-devel +net-tools +NetworkManager-glib-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +poppler-devel +postgresql-devel +pth-devel +pulseaudio-libs-devel +qt-devel +readline-devel +recode +redhat-rpm-config +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +systemd-devel +t1lib-devel +t1utils +taglib-devel +tar +texinfo +torsocks +transfig +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xine-lib-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-base +xscreensaver-extras +xscreensaver-gl-base +xscreensaver-gl-extras +xulrunner-devel +xz-devel +yum-plugin-ovl diff --git a/redhat/docker/el7/rpmbuild.repo b/redhat/docker/el7/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el7/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/el7/rpmmacros b/redhat/docker/el7/rpmmacros new file mode 100644 index 000000000..b76d30014 --- /dev/null +++ b/redhat/docker/el7/rpmmacros @@ -0,0 +1,3 @@ +%dist .el7 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 new file mode 100644 index 000000000..c5338a77d --- /dev/null +++ b/redhat/docker/f25/Dockerfile.x86_64 @@ -0,0 +1,21 @@ +FROM fedora:25 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-25.noarch.rpm + +# Install Trinity build dependencies +ADD packages /etc/yum.repos.d/packages +RUN dnf update -y +RUN dnf install -y $(</etc/yum.repos.d/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" + +# 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/f25/packages b/redhat/docker/f25/packages new file mode 100644 index 000000000..e7a74d19f --- /dev/null +++ b/redhat/docker/f25/packages @@ -0,0 +1,215 @@ +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 +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 +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +libmusicbrainz5-devel +libnjb-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +pth-devel +pulseaudio-libs-devel +qt4-devel +recode +redhat-rpm-config +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +sword-devel +t1lib-devel +t1utils +taglib-devel +tar +texinfo +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/docker/f25/rpmbuild.repo b/redhat/docker/f25/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f25/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/f25/rpmmacros b/redhat/docker/f25/rpmmacros new file mode 100644 index 000000000..8a4c9a52a --- /dev/null +++ b/redhat/docker/f25/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc25 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 new file mode 100644 index 000000000..ea78581fa --- /dev/null +++ b/redhat/docker/f26/Dockerfile.i686 @@ -0,0 +1,21 @@ +FROM fedora32:26 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=i686 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-26.noarch.rpm + +# Install Trinity build dependencies +ADD packages /etc/yum.repos.d/packages +RUN setarch i686 dnf update -y +RUN setarch i686 dnf install -y $(</etc/yum.repos.d/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" + +# 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/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 new file mode 100644 index 000000000..3899d1220 --- /dev/null +++ b/redhat/docker/f26/Dockerfile.x86_64 @@ -0,0 +1,21 @@ +FROM fedora:26 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-26.noarch.rpm + +# Install Trinity build dependencies +ADD packages /etc/yum.repos.d/packages +RUN dnf update -y +RUN dnf install -y $(</etc/yum.repos.d/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" + +# 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/f26/packages b/redhat/docker/f26/packages new file mode 100644 index 000000000..28da2c8db --- /dev/null +++ b/redhat/docker/f26/packages @@ -0,0 +1,216 @@ +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 +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 +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +libmusicbrainz5-devel +libnjb-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +pth-devel +pulseaudio-libs-devel +qt4-devel +recode +redhat-rpm-config +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +sword-devel +t1lib-devel +t1utils +taglib-devel +tar +texinfo +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/docker/f26/rpmbuild.repo b/redhat/docker/f26/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f26/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/f26/rpmmacros b/redhat/docker/f26/rpmmacros new file mode 100644 index 000000000..dd8d85c81 --- /dev/null +++ b/redhat/docker/f26/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc26 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 new file mode 100644 index 000000000..01f6f764f --- /dev/null +++ b/redhat/docker/f27/Dockerfile.i686 @@ -0,0 +1,22 @@ +FROM fedora32:27 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=i686 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-27.noarch.rpm + +# Install Trinity build dependencies +RUN setarch i686 dnf update -y +ADD packages /etc/yum.repos.d/packages +RUN setarch i686 dnf install -y texlive-base +RUN setarch i686 dnf install -y $(</etc/yum.repos.d/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" + +# 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/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 new file mode 100644 index 000000000..e2ecadf4d --- /dev/null +++ b/redhat/docker/f27/Dockerfile.x86_64 @@ -0,0 +1,21 @@ +FROM fedora:27 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-27.noarch.rpm + +# Install Trinity build dependencies +RUN dnf update -y +ADD packages /etc/yum.repos.d/packages +RUN dnf install -y $(</etc/yum.repos.d/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" + +# 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/f27/packages b/redhat/docker/f27/packages new file mode 100644 index 000000000..658696a81 --- /dev/null +++ b/redhat/docker/f27/packages @@ -0,0 +1,214 @@ +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 +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 +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +libmusicbrainz5-devel +libnjb-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +pulseaudio-libs-devel +qt4-devel +recode +redhat-rpm-config +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f27/rpmbuild.repo b/redhat/docker/f27/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f27/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/f27/rpmmacros b/redhat/docker/f27/rpmmacros new file mode 100644 index 000000000..82424fcbf --- /dev/null +++ b/redhat/docker/f27/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc27 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 new file mode 100644 index 000000000..1927d264b --- /dev/null +++ b/redhat/docker/f28/Dockerfile.i686 @@ -0,0 +1,24 @@ +FROM fedora32:28 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=i686 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm + +# Install Trinity build dependencies +RUN setarch i686 dnf update -y +ADD packages /packages +RUN touch /var/lib/rpm/* +RUN setarch i686 dnf install -y $(</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" + +# 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/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 new file mode 100644 index 000000000..6c26addda --- /dev/null +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -0,0 +1,24 @@ +FROM fedora:28 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=x86_64 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm + +# Install Trinity build dependencies +RUN dnf update -y +ADD packages /packages +RUN touch /var/lib/rpm/* +RUN dnf install -y $(</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" + +# 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/f28/packages b/redhat/docker/f28/packages new file mode 100644 index 000000000..6ada73c34 --- /dev/null +++ b/redhat/docker/f28/packages @@ -0,0 +1,219 @@ +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 +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 +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 +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +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 +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +pulseaudio-libs-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f28/rpmbuild.repo b/redhat/docker/f28/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f28/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/f28/rpmmacros b/redhat/docker/f28/rpmmacros new file mode 100644 index 000000000..9126fb2b2 --- /dev/null +++ b/redhat/docker/f28/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc28 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/fedora32.sh b/redhat/docker/fedora32.sh new file mode 100755 index 000000000..823b27fbc --- /dev/null +++ b/redhat/docker/fedora32.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +NAME="fedora32" +VERSION="$1" # E.g: '26' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +setarch i686 sudo dnf install \ + --refresh \ + --installroot="${INSTALLROOT}" \ + --releasever="${VERSION}" \ + --disablerepo="*" --enablerepo="fedora,updates" \ + --nodocs \ + --assumeyes \ + @core bash vim + +sudo sed -i "${INSTALLROOT}/etc/yum.repos.d/"*".repo" \ + -e "s|\$basearch|i386|g" \ + -e "s|\$releasever|${VERSION}|g" + +sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh new file mode 100755 index 000000000..29afb4b59 --- /dev/null +++ b/redhat/docker/mageia32.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +NAME="mageia32" +VERSION="$1" # E.g: '26' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" +setarch i686 sudo urpmi \ + --root="${INSTALLROOT}" \ + --auto \ + bash vim urpmi mageia-release-common + +sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 new file mode 100644 index 000000000..693b30b4f --- /dev/null +++ b/redhat/docker/mga5/Dockerfile.x86_64 @@ -0,0 +1,35 @@ +FROM mageia:5.1 + +ARG TDE_VERSION=14.0.4 +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}" + +# 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 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 + +# 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 + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" diff --git a/redhat/docker/mga5/packages.x86_64 b/redhat/docker/mga5/packages.x86_64 new file mode 100644 index 000000000..4cdd228c6 --- /dev/null +++ b/redhat/docker/mga5/packages.x86_64 @@ -0,0 +1,236 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-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 +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +hunspell-en +ImageMagick-devel +imake +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 +lib64avformat56 +lib64binutils-devel +lib64clucene-devel +lib64commoncpp-devel +lib64cryptsetup-devel +lib64curl-devel +lib64dvdread-devel +lib64ecpg9.4_6 +lib64exiv2-devel +lib64ffmpeg-devel +lib64flac-devel +lib64flac++-devel +lib64fontenc-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lame-devel +lib64lua-devel +lib64mad-devel +lib64paper-devel +lib64pkcs11-helper-devel +lib64poppler-devel +lib64pulseaudio-devel +lib64sane1-devel +lib64t1lib-devel +lib64tiff-devel +lib64twolame-devel +lib64udev-devel +lib64usb1.0-devel +lib64utempter-devel +lib64v4l-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine1.2-devel +lib64xscrnsaver-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64yaz-devel +libart_lgpl-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libidn-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon +ocaml +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +optipng +pam-devel +pciutils-devel +perl-devel +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +postgresql9.4 +postgresql9.4-devel +pth-devel +python-devel +python-sip +qt4-devel +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sudo +subversion-devel +sword-devel +taglib-devel +transfig +udisks2-devel +udisks-devel +unixODBC-devel +usbutils +valgrind +wv2-devel +x11-font-util +xbase-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz +zlib-devel diff --git a/redhat/docker/mga5/rpmmacros b/redhat/docker/mga5/rpmmacros new file mode 100644 index 000000000..146da3559 --- /dev/null +++ b/redhat/docker/mga5/rpmmacros @@ -0,0 +1,3 @@ +%dist .mga5 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 new file mode 100644 index 000000000..956755001 --- /dev/null +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -0,0 +1,35 @@ +FROM mageia32:6 + +ARG TDE_VERSION=14.0.5 +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}" + +# 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 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 + +# 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 + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 new file mode 100644 index 000000000..8a1048fe8 --- /dev/null +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -0,0 +1,35 @@ +FROM mageia:6 + +ARG TDE_VERSION=14.0.5 +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}" + +# 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 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 + +# 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 + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 new file mode 100644 index 000000000..973e8b7b4 --- /dev/null +++ b/redhat/docker/mga6/packages.i686 @@ -0,0 +1,240 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-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 +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +hunspell-en +ImageMagick-devel +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +karma-sharp +kde-dev-scripts +lcms-devel +libapr-devel +libapr-util-devel +libavformat57 +libbinutils-devel +libclucene-devel +libcommoncpp-devel +libcryptsetup-devel +libcurl-devel +libdvdread-devel +libecpg9.4_6 +libexiv2-devel +libfbclient-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libfontenc-devel +libgstreamer1.0-devel +libgstreamer-plugins-base1.0-devel +libinotifytools-devel +libjasper-devel +libjpeg-devel +libmp3lame-devel +liblua-devel +libmad-devel +libpaper-devel +libpkcs11-helper-devel +libpoppler-devel +libpulseaudio-devel +libsane1-devel +libt1lib-devel +libtiff-devel +libtwolame-devel +libutempter +libudev-devel +libusb1.0-devel +libutempter-devel +libv4l-devel +libxaw-devel +libxdg-basedir-devel +libxi-devel +libxine1.2-devel +libxscrnsaver-devel +libxtst-devel +libxxf86dga-devel +libyaz-devel +libart_lgpl-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libidn-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon +ocaml +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +optipng +pam-devel +pciutils-devel +perl-devel +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +postgresql9.4 +postgresql9.4-devel +pth-devel +python-devel +python-sip +qt4-devel +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sudo +subversion-devel +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 +yaz +zlib-devel diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 new file mode 100644 index 000000000..996963cf2 --- /dev/null +++ b/redhat/docker/mga6/packages.x86_64 @@ -0,0 +1,239 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-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 +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +hunspell-en +ImageMagick-devel +imake +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 +lib64avformat57 +lib64binutils-devel +lib64clucene-devel +lib64commoncpp-devel +lib64cryptsetup-devel +lib64curl-devel +lib64dvdread-devel +lib64ecpg9.4_6 +lib64exiv2-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac-devel +lib64flac++-devel +lib64fontenc-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64mp3lame-devel +lib64lua-devel +lib64mad-devel +lib64paper-devel +lib64pkcs11-helper-devel +lib64poppler-devel +lib64pulseaudio-devel +lib64sane1-devel +lib64t1lib-devel +lib64tiff-devel +lib64twolame-devel +lib64udev-devel +lib64usb1.0-devel +lib64utempter-devel +lib64v4l-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine1.2-devel +lib64xscrnsaver-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64yaz-devel +libart_lgpl-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libidn-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon +ocaml +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +optipng +pam-devel +pciutils-devel +perl-devel +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +postgresql9.4 +postgresql9.4-devel +pth-devel +python-devel +python-sip +qt4-devel +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sudo +subversion-devel +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 +yaz +zlib-devel diff --git a/redhat/docker/mga6/rpmmacros b/redhat/docker/mga6/rpmmacros new file mode 100644 index 000000000..87fb3a9b9 --- /dev/null +++ b/redhat/docker/mga6/rpmmacros @@ -0,0 +1,3 @@ +%dist .mga6 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/opensuse.sh b/redhat/docker/opensuse.sh new file mode 100755 index 000000000..27a131c76 --- /dev/null +++ b/redhat/docker/opensuse.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME="opensuse" +VERSION="$1" # E.g: '42.3' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" + +sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/distribution/leap/${VERSION}/repo/oss/" "oss" +sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/distribution/leap/${VERSION}/repo/non-oss/" "non-oss" +sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss" +sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" +sudo zypper --root "${INSTALLROOT}" \ + --gpg-auto-import-keys ref +sudo zypper --root "${INSTALLROOT}" \ + install -y bash vim zypper openSUSE-release + +sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh new file mode 100755 index 000000000..a3b888c75 --- /dev/null +++ b/redhat/docker/opensuse32.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +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" +else + URL="http://download.opensuse.org/distribution/leap/${VERSION}" +fi + +sudo zypper --root "${INSTALLROOT}" \ + ar "${URL}/repo/oss/" "oss" +sudo zypper --root "${INSTALLROOT}" \ + ar "${URL}/repo/non-oss/" "non-oss" + +if [ "${VERSION}" != "tumbleweed" ]; then + sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss" + sudo zypper --root "${INSTALLROOT}" \ + ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" +fi +setarch i686 sudo zypper --root "${INSTALLROOT}" \ + --gpg-auto-import-keys ref +setarch i686 sudo zypper --root "${INSTALLROOT}" \ + install -y bash vim zypper openSUSE-release + +sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 new file mode 100644 index 000000000..67928e55a --- /dev/null +++ b/redhat/docker/oss131/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:13.1 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add PACKMAN repository +RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_13.1/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /etc/zypp/packages +RUN zypper install -l -y $(</etc/zypp/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/docker/oss131/packages b/redhat/docker/oss131/packages new file mode 100644 index 000000000..31065e63f --- /dev/null +++ b/redhat/docker/oss131/packages @@ -0,0 +1,177 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +automake +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +esound-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmime-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +intltool +java-1_7_0-openjdk-devel +libacl-devel +libart_lgpl-devel +libaudio-devel +libavahi-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libffmpeg-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-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 +libofx-devel +libotr-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpth-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +recode +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sword-devel +transfig +udisks2-devel +udisks-devel +unixODBC-devel +update-desktop-files +utempter-devel +valgrind +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss131/rpmmacros b/redhat/docker/oss131/rpmmacros new file mode 100644 index 000000000..d2ad3b756 --- /dev/null +++ b/redhat/docker/oss131/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss131 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 new file mode 100644 index 000000000..b6a8ef713 --- /dev/null +++ b/redhat/docker/oss132/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:13.2 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=x86_64 + +# Add PACKMAN repository +RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_13.2/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /etc/zypp/packages +RUN zypper install -l -y $(</etc/zypp/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/docker/oss132/packages b/redhat/docker/oss132/packages new file mode 100644 index 000000000..5043e7483 --- /dev/null +++ b/redhat/docker/oss132/packages @@ -0,0 +1,171 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +automake +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +esound-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +java-1_8_0-openjdk-devel +libacl-devel +libart_lgpl-devel +libaudio-devel +libavahi-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libffmpeg-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-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 +libofx-devel +libotr-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpth-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +recode +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sword-devel +transfig +udisks2-devel +udisks-devel +unixODBC-devel +update-desktop-files +utempter-devel +valgrind +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss132/rpmmacros b/redhat/docker/oss132/rpmmacros new file mode 100644 index 000000000..096041924 --- /dev/null +++ b/redhat/docker/oss132/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss132 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 new file mode 100644 index 000000000..39c03d7fd --- /dev/null +++ b/redhat/docker/oss150/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:15.0 + +ARG TDE_VERSION=14.0.5 +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.0/ 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/docker/oss150/packages b/redhat/docker/oss150/packages new file mode 100644 index 000000000..b1b9afe3c --- /dev/null +++ b/redhat/docker/oss150/packages @@ -0,0 +1,185 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +cln-devel +clucene-core-devel +cmake +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmime-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libbz2-devel +libcap-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 +libgssglue-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libotr-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 +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +qt-devel +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +wireless-tools +wv2-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss150/rpmmacros b/redhat/docker/oss150/rpmmacros new file mode 100644 index 000000000..9869e1ec2 --- /dev/null +++ b/redhat/docker/oss150/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss150 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 new file mode 100644 index 000000000..94c0742eb --- /dev/null +++ b/redhat/docker/oss421/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:42.1 + +ARG TDE_VERSION=14.0.4 +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_42.1/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /etc/zypp/packages +RUN zypper install -l -y $(</etc/zypp/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/docker/oss421/packages b/redhat/docker/oss421/packages new file mode 100644 index 000000000..2dfb4f848 --- /dev/null +++ b/redhat/docker/oss421/packages @@ -0,0 +1,170 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +automake +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chrpath +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +esound-devel +fdupes +ffmpeg-devel +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-0_10-devel +gstreamer-0_10-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +java-1_8_0-openjdk-devel +libacl-devel +libart_lgpl-devel +libavahi-devel +libavahi-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexiv2-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libofx-devel +libotr-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpth-devel +libpulse-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +recode +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +sword-devel +transfig +udisks2-devel +udisks-devel +unixODBC-devel +update-desktop-files +utempter-devel +valgrind +wireless-tools +wv2-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss421/rpmmacros b/redhat/docker/oss421/rpmmacros new file mode 100644 index 000000000..ac326d3c1 --- /dev/null +++ b/redhat/docker/oss421/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss421 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 new file mode 100644 index 000000000..ecb34f1ef --- /dev/null +++ b/redhat/docker/oss422/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:42.2 + +ARG TDE_VERSION=14.0.4 +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_42.2/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /etc/zypp/packages +RUN zypper install -l -y $(</etc/zypp/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/docker/oss422/packages b/redhat/docker/oss422/packages new file mode 100644 index 000000000..fe79c5038 --- /dev/null +++ b/redhat/docker/oss422/packages @@ -0,0 +1,183 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmime-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-0_10-devel +gstreamer-0_10-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +libacl-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libesd-devel +libexempi-devel +libexiv2-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libofx-devel +libotr-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpth-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +qt-devel +recode +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +sword-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +wireless-tools +wv2-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss422/rpmmacros b/redhat/docker/oss422/rpmmacros new file mode 100644 index 000000000..93ec36b2e --- /dev/null +++ b/redhat/docker/oss422/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss422 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 new file mode 100644 index 000000000..ff70474da --- /dev/null +++ b/redhat/docker/oss423/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse:42.3 + +ARG TDE_VERSION=14.0.5 +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_42.3/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /etc/zypp/packages +RUN zypper install -l -y $(</etc/zypp/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/docker/oss423/packages b/redhat/docker/oss423/packages new file mode 100644 index 000000000..fe79c5038 --- /dev/null +++ b/redhat/docker/oss423/packages @@ -0,0 +1,183 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmime-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-0_10-devel +gstreamer-0_10-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +libacl-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libesd-devel +libexempi-devel +libexiv2-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libofx-devel +libotr-devel +libpisock-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpth-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsmbclient-devel +libsndfile-devel +libtag-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +python-sip-devel +qt-devel +recode +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +sword-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +wireless-tools +wv2-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss423/rpmmacros b/redhat/docker/oss423/rpmmacros new file mode 100644 index 000000000..48dda8fe4 --- /dev/null +++ b/redhat/docker/oss423/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss423 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 new file mode 100644 index 000000000..02f84bb8c --- /dev/null +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -0,0 +1,25 @@ +FROM opensuse32:tumbleweed + +ARG TDE_VERSION=14.0.5 +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) + +# 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/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 new file mode 100644 index 000000000..156a3a1b8 --- /dev/null +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -0,0 +1,25 @@ +FROM opensuse:tumbleweed + +ARG TDE_VERSION=14.0.5 +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) + +# 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/docker/osstw/packages b/redhat/docker/osstw/packages new file mode 100644 index 000000000..f1cb04d23 --- /dev/null +++ b/redhat/docker/osstw/packages @@ -0,0 +1,195 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +cln-devel +clucene-core-devel +cmake +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +glu-devel +gmime-devel +gmp-devel +gnokii-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +ImageMagick-devel +imake +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libfontenc-devel +libgadu-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libical-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmariadb-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libopenssl-devel +libotr-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 +libtwolame-devel +libudev-devel +libudisks2-0-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXdmcp-devel +libxine-devel +libxkbfile-devel +libXmu-devel +libxslt-devel +libXss-devel +libXt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +lilo +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +openssl +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pkcs11-helper-devel +postgresql +postgresql-devel +python-devel +qt-devel +rpcgen +rpm-build +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +wireless-tools +wv2-devel +xcb-proto-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros new file mode 100644 index 000000000..0f4902670 --- /dev/null +++ b/redhat/docker/osstw/rpmmacros @@ -0,0 +1,3 @@ +%dist .osstw +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh new file mode 100755 index 000000000..3791afc94 --- /dev/null +++ b/redhat/docker/pclinuxos.sh @@ -0,0 +1,173 @@ +#!/bin/bash + +NAME="pclinuxos" +VERSION="$1" # E.g: '26' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" + +MIRROR="http://distrib-coffee.ipsl.jussieu.fr/pub/linux/pclinuxos/pclinuxos/apt/pclinuxos/64bit" + +cd /dev/shm +wget -c \ + "${MIRROR}/RPMS.x86_64/bash-4.3-48.1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/glibc-2.20-10pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rpm-4.8.1-10pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64readline6-6.3-4pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ncurses5-5.9-9pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rpm-helper-0.23.5-1pclos2015.noarch.rpm" \ + "${MIRROR}/RPMS.x86_64/mktemp-1.7-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/setup-2.7.17-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/findutils-4.6.0-3pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/run-parts-3.2.1-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/shadow-utils-4.1.4.2-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/coreutils-8.27-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/chkconfig-1.3.37-4pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ncursesw5-5.9-9pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/gawk-4.1.2-1pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64rpm1-4.8.1-10pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/cpio-2.11-3pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/gawk-4.1.2-1pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/grep-2.28-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rpm-rambo-setup-1.1-2pclos2017.noarch.rpm" \ + "${MIRROR}/RPMS.x86_64/rpm-pclinuxos-setup-1.135-4pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64popt0-1.16-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64tcb0-1.0.3-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64pam_userpass1-1.0.2-2pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/pam_tcb-1.0.3-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64lzma5-5.2.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/bzip2-1.0.6-2pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64audit1-2.1.2-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/update-alternatives-1.9.0-1pclos2011.noarch.rpm" \ + "${MIRROR}/RPMS.x86_64/zlib1-1.2.10-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64bzip2_1-1.0.6-2pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/util-linux-ng-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64acl1-2.2.51-1pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64attr1-2.4.46-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64cap2-2.25-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64gmp10-6.1.2-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/info-install-5.0-2pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rmt-0.4b46-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64mpfr4-3.1.4-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64sigsegv2-2.10-2pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/dash-static-0.5.6.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/filesystem-2.1.9-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/dash-static-0.5.6.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64pcre2_0-10.23-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64pcre1-8.36-1pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/xz-5.2.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/ncurses-5.9-9pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/libgcc1-4.9.2-2pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/libstdc++6-4.9.2-2pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64uuid1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64udev0-168-6pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64smartcols1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64mount1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64fdisk1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64libcap-ng0-0.7.7-1pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64blkid1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/udev-168-6pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64iso9660_7-0.93-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64blkid1-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/diffutils-3.3-1pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64usb1.0_0-1.0.21-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/openssl-1.0.2l-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64cdio12-0.93-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64pcre-compatible0-8.21-1pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/popt-data-1.16-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64db4.8-4.8.30-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64elfutils1-0.166-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64lua5.1-5.1.5-1pclos2012.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64magic1-5.31-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64nspr4-4.14-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64nss3-3.28.4-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64sqlite3_0-3.1070-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rootcerts-20170401.00-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/ldetect-lst-0.2.8-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/nss-3.28.4-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/perl-base-5.22.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/gzip-1.8-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/usbutils-007-1pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64notify4-0.7.7-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/less-487-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64glib2.0_0-2.52.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64gio2.0_0-2.52.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/gdk-pixbuf2.0-2.36.7-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/tcb-1.0.3-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/pkgconfig-0.29-1pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64openssl1.0.0-1.0.2l-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/common-licenses-1.0-14pclos2017.noarch.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64gdk_pixbuf2.0_0-2.36.7-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64notify4-0.7.7-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/file-5.31-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ffi6-3.2.1-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/perl-5.22.3-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64tiff3-3.9.5-2pclos2012.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/libnotify-0.7.7-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64x11_6-1.6.5-2.1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64jasper1-1.900.1-3pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64jpeg8-1.4.2-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64png3-1.2.57-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/libxcb-1.12-3.1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64gdbm3-1.8.3-5pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/nss_tcb-1.0.3-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64usb-compat0.1_4-0.1.5-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64tiff5-4.0.6-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64openssl-engines1.0.0-1.0.2l-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64xau6-1.0.8-3.1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64xdmcp6-1.1.2-3.1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64jbig1-2.0-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64bsd0-0.8.3-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64icu56-56.1-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/icu56-data-56.1-1pclos2016.noarch.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64jpeg62-6b-48pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/cracklib-dicts-2.9.1-1pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64crack2-2.9.1-1pclos2014.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64dbnss4.8-4.8.30-1pclos2011.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/apt-0.5.15lorg3.95-10pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/gnupg-1.4.22-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64apt-pkg0-0.5.15lorg3.95-10pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/apt-sources-list-1.2-7pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64curl4-7.54.0-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ldap2.4_2-2.4.23-3pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/apt-common-0.5.15lorg3.95-10pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64xml2_2-2.9.4-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64rtmp1-2.4-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ssh2_1-1.6.0-1pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/openldap-2.4.23-3pclos2015.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64sasl2-2.1.23-3pclos2013.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64krb53-1.15.1-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/krb5-1.15.1-2pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64keyutils1-1.2-6pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64verto1-0.2.6-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64ext2fs2-1.43.1-2pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/e2fsprogs-1.43.1-2pclos2016.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/uuidd-2.30.1-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/lib64audit-devel-2.1.2-3pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/glibc-devel-2.20-10pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/glibc-headers-devel-4.9.4-1pclos2017.x86_64.rpm" \ + "${MIRROR}/RPMS.x86_64/rpm-pclinuxos-setup-1.135-5pclos2017.x86_64.rpm" \ + "http://ftp.nluug.nl/pub/os/Linux/distr/pclinuxos/pclinuxos/apt/pclinuxos/64bit/RPMS.x86_64/lib64pam0-1.1.4-1pclos2011.x86_64.rpm" \ + "http://ftp.nluug.nl/pub/os/Linux/distr/pclinuxos/pclinuxos/apt/pclinuxos/64bit/RPMS.x86_64/pam-1.1.4-1pclos2011.x86_64.rpm" \ + "http://ftp.nluug.nl/pub/os/Linux/distr/pclinuxos/pclinuxos/apt/pclinuxos/64bit/RPMS.x86_64/lib64pam-devel-1.1.4-1pclos2011.x86_64.rpm" \ + "http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/x86_64/media/core/release//fdupes-1.51-6.mga6.x86_64.rpm" \ + +sudo mkdir -p "${INSTALLROOT}/var/lib/rpm" +sudo rpmdb --initdb --root="${INSTALLROOT}" + +sudo rpm -Uvh \ + --root="${INSTALLROOT}" \ + *.rpm + +cd - + +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb + +sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +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 new file mode 100644 index 000000000..67f7893d1 --- /dev/null +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -0,0 +1,32 @@ +FROM pclinuxos:2017 + +ARG TDE_VERSION=14.0.5 +ARG ARCH=x86_64 + +# Update distribution +RUN apt-get -y update +RUN apt-get -y dist-upgrade + +# Install Trinity build dependencies +ADD packages.${ARCH} /packages +RUN 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|^|#|" + +# 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 diff --git a/redhat/docker/pclinuxos/genla.sh b/redhat/docker/pclinuxos/genla.sh new file mode 100755 index 000000000..ecc7ac98f --- /dev/null +++ b/redhat/docker/pclinuxos/genla.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +LIB="$1" +LIBDIR="$(rpm -E %_libdir)" +FILENAME="${LIB}.la" +FILE="${LIBDIR}/${FILENAME}" + +if [ -r "${FILE}" ]; then + echo "Already exists !!! Abort" + exit 1 +fi + +LIBLONG="$(echo ${LIBDIR}/${LIB}.so.*.*)" +LIBSHORT="$(echo ${LIBDIR}/${LIB}.so.?)" + +echo "Library: ${LIBLONG} | ${LIBSHORT}" + + +cat <<EOF >/tmp/$LIB.$$ +# ${FILENAME} - a libtool library file +# Generated by libtool (GNU libtool) 2.4.2 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='${LIBSHORT}' + +# Names of this library. +library_names='${LIBLONG} ${LIBSHORT} ${LIB}.so' + +# The name of the static archive. +old_library='${LIB}.a' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -lm' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for ${LIB}. +current=4 +age=2 +revision=0 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='${LIBDIR}' +EOF + +[ $(whoami) = "root" ] || SUDO="sudo" +$SUDO mv "/tmp/$LIB.$$" "${FILE}" diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 new file mode 100644 index 000000000..7079d8d65 --- /dev/null +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -0,0 +1,174 @@ +alsa-lib-devel +aspell-devel +audiofile-devel +audit-devel +binutils-devel +bison +boost-devel +ccache +cdparanoia +chmlib-devel +chrpath +cmake +cups-devel +desktop-file-utils +djvulibre +docbook-style-xsl +doxygen +drakconf +dssi-devel +esound-devel +exempi-devel +fdupes +file-devel +firebird-devel +flex +fontconfig-devel +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +gettext-devel +glib2-devel +gnokii-devel +gnutls-devel +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gtk2-devel +gtk+3.0-devel +hspell-devel +htdig +ImageMagick-devel +imake +java-devel +lcms-devel +lib64cryptsetup-devel +lib64dvdread-devel +lib64exiv2-devel +lib64gif-devel +lib64idn-devel +lib64inotifytools-devel +lib64iw29-devel +lib64nm-devel +lib64mpcdec-devel +lib64OpenSP5-devel +lib64pkcs11-helper-devel +lib64poppler-devel +lib64readline-devel +lib64sane1-devel +lib64usb1.0-devel +lib64usb-compat0.1-devel +lib64wv2-devel +lib64xaw-devel +lib64xine1.2-devel +lib64yaz-devel +libcap-devel +libcdda-devel +libconfig-devel +libcurl-devel +libffmpeg-devel +libflac-devel +libflac++-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgstreamer0.10-devel +libical-devel +libice-devel +libjack-devel +libjasper-devel +libjpeg-devel +liblame-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofa-devel +libofx-devel +libotr-devel +libpaper-devel +lib64png1.6-devel +libpqxx-devel +libpthread-stubs +libpulseaudio-devel +libqalculate-devel +libraw1394-devel +librsvg +librsync-devel +libsmbclient-devel +libsm-devel +libt1lib-devel +libtheora-devel +libudev-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcb-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +lib64xine1.2-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxscrnsaver-devel +libxslt-devel +libxxf86dga-devel +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +net-snmp-devel +ocaml +OpenEXR-devel +openldap-devel +opensc +openslp-devel +pam-devel +perl-devel +pilot-link-devel +postgresql +postgresql-devel +pth-devel +python-devel +python-rpm +recode +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +subversion-devel +sudo +sword-devel +taglib-devel +transfig +udisks2-devel +unixODBC-devel +utempter-devel +valgrind +vim-enhanced +x11-font-util +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz diff --git a/redhat/docker/pclinuxos/rpmbuild.list b/redhat/docker/pclinuxos/rpmbuild.list new file mode 100644 index 000000000..5b838caa9 --- /dev/null +++ b/redhat/docker/pclinuxos/rpmbuild.list @@ -0,0 +1 @@ +rpm file:/home/trinity/rpmbuild RPMS.tde-${TDE_VERSION} ${ARCH} noarch diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros new file mode 100644 index 000000000..59b0e9d95 --- /dev/null +++ b/redhat/docker/pclinuxos/rpmmacros @@ -0,0 +1,4 @@ +%dist .pclos2018 +%_smp_mflags -j8 +%jobs 8 +%pclinuxos 2018 diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh new file mode 100755 index 000000000..30faba056 --- /dev/null +++ b/redhat/docker/run.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +DISTRIB="$1" +TDE_VERSION="$2" +ARCH="$3" + +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${ARCH}" ] && ARCH="x86_64" + +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" + +docker run -t -i --rm --privileged \ + -h "${IMAGE}" \ + --name "${IMAGE//:/-}" \ + -v /dev/shm/docker:/tmp:z \ + -u trinity \ + -e TMPPATH=/tmp \ + -e TDE_VERSION=${TDE_VERSION} \ + -w /home/trinity/tde/tde-packaging/redhat \ + -v ${HOME}/.gnupg:/home/trinity/.gnupg \ + -v ${HOME}/tde/tde-packaging:/home/trinity/tde/tde-packaging \ + -v ${HOME}/tde/tde-tarballs:/home/trinity/tde/tde-tarballs \ + -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \ + -v ${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/SRPMS.tde-${TDE_VERSION} \ + "${IMAGE}" setarch ${ARCH} bash diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec index 5f2d31ea5..a0abf2cf5 100644 --- a/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec +++ b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package brp-check-trinity (version R14.0.0) +# spec file for package brp-check-trinity (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,11 +12,13 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_prefix /opt/trinity Name: brp-check-trinity @@ -64,9 +66,11 @@ for i in \ brp-desktop.data/xdg_menu \ brp-suse.d/brp-25-symlink \ brp-suse.d/brp-72-extract-appdata \ + map-desktop-category.sh \ suse_update_desktop_file.sh \ ; do echo "Patching file '/usr/lib/rpm/${i}' ..." + [ -r "/usr/lib/rpm/${i}" ] || continue install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}" sed -i "/usr/lib/rpm/${i}" \ -e "s|opt/kde3|opt/trinity|g" \ @@ -76,7 +80,9 @@ for i in \ -e "s|doc/kde|doc/tde|g" \ -e "s|kde_xdgdata|tde_xdgdata|g" \ -e "s|applications/kde|applications/tde|g" \ - -e "s|KDE|TDE|g" + -e "s|KDE|TDE|g" \ + -e "s|kde-|tde-|g" \ + -e "s|tde-settings.menu|kde-settings.menu|" done @@ -87,8 +93,10 @@ for i in \ brp-desktop.data/xdg_menu \ brp-suse.d/brp-25-symlink \ brp-suse.d/brp-72-extract-appdata \ + map-desktop-category.sh \ suse_update_desktop_file.sh \ ; do + [ -r "/usr/lib/rpm.orig/${i}" ] || continue echo "Restoring file '/usr/lib/rpm/${i}' ..." install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}" done @@ -107,5 +115,3 @@ rm -rf "/usr/lib/rpm.orig" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec new file mode 100644 index 000000000..204996c77 --- /dev/null +++ b/redhat/extras/brp-check-trinity/brp-check-trinity-3.5.13.2.spec @@ -0,0 +1,105 @@ +# +# spec file for package brp-check-trinity (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_version 3.5.13.2 +%define tde_prefix /opt/trinity + +Name: brp-check-trinity +Version: 1.0 +Release: 1%{?dist} +Summary: Build root policy check scripts for Trinity +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) +BuildArch: noarch + +BuildRequires: update-desktop-files +BuildRequires: brp-check-suse +BuildRequires: brp-extract-appdata +Requires: update-desktop-files +Requires: brp-check-suse +Requires: brp-extract-appdata +Requires: sed + + + +%description +This package dynamically patches the openSUSE brp script to allow +building of Trinity Desktop Environment (TDE) instead of KDE3. +It should not be installed on runtime computer. + + +%files + +%post +for i in \ + brp-desktop.data/applications.menu \ + brp-desktop.data/kde-settings.menu \ + brp-desktop.data/xdg_menu \ + brp-suse.d/brp-25-symlink \ + brp-suse.d/brp-72-extract-appdata \ + suse_update_desktop_file.sh \ +; do + echo "Patching file '/usr/lib/rpm/${i}' ..." + install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}" + sed -i "/usr/lib/rpm/${i}" \ + -e "s|opt/kde3|opt/trinity|g" \ + -e "s|kde-settings-|tde-settings-|g" \ + -e "s|doc/kde|doc/tde|g" \ + -e "s|kde_xdgdata|tde_xdgdata|g" \ +done + + +%postun +for i in \ + brp-desktop.data/applications.menu \ + brp-desktop.data/kde-settings.menu \ + brp-desktop.data/xdg_menu \ + brp-suse.d/brp-25-symlink \ + brp-suse.d/brp-72-extract-appdata \ + suse_update_desktop_file.sh \ +; do + echo "Restoring file '/usr/lib/rpm/${i}' ..." + install "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}" +done +rm -rf "/usr/lib/rpm.orig" + +########## + +%prep + +%build + +%install + +%clean +%__rm -rf %{?buildroot} + + +%changelog diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 408798e28..0db433bc2 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -12,13 +12,17 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # Extract from 'fileshareset.cpp' #copyright : (C) 2003 SuSE AG #email : Uwe.Gansert@suse.de +%if 0%{?fedora} >= 27 +%global debug_package %{nil} +%endif + Name: fileshareset Version: 2.0 Release: 1%{?dist} @@ -48,8 +52,11 @@ PreReq: permissions BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ +BuildRequires: libtool -#Requires: +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif %description This package contains the the fileshareset utility to allow users to @@ -60,6 +67,7 @@ This utility was originally written for openSUSE KDE3. %prep %setup -q -n fileshareset2 +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" aclocal autoconf automake -a -c @@ -69,8 +77,8 @@ automake -a -c export CXXFLAGS="$CXXFLAGS -fPIE" export CFLAGS="$CFLAGS -fPIE" export LDFLAGS="$LDFLAGS -pie" -%configure -%__make %{?_smp_mflags} +%configure --disable-dependency-tracking +%__make %{?_smp_mflags} || %__make %install @@ -111,5 +119,3 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf" %changelog -* Sun Oct 5 2014 François Andriot <francois.andriot@free.fr> - 2.0-1 -- Initial build for TDE R14 diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index 3dcfe7274..a2a42e6c6 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -227,5 +227,3 @@ rm -rf %{buildroot} %changelog -* Sun Oct 05 2014 Francois Andriot <francois.andriot@free.fr> - 3.2.0b7-1 -- Initial build for TDE R14 diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec new file mode 100644 index 000000000..f3547a475 --- /dev/null +++ b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec @@ -0,0 +1,115 @@ +# +# spec file for package icons-nuvola (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/ +# + +# Default version for this component +%define tde_pkg icons-nuvola +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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: Nuvola icons for TDE Desktop +Version: 1.0 +Release: %{?!preversion:1}%{?preversion:0_%{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: icons-nuvola-14.0.0.tar.bz2 + +BuildArch: noarch + +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 +Nuvola SVG evolution of SKY icon theme. + + NUVOLA is an SVG based icon theme. + This mean that all icons where designed with a vector graphics software and + then exported to SVG. + Icons of the TDE version of Nuvola are PNG images (unscalable). + SVG files are available (not always updated) on my web site in the "svg" + section. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n nuvola + + +%build + + +%install +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/16x16 +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/32x32 +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/48x48 +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/64x64 +install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/128x128 +rm -f thanks.to~ +cp -fr * %{buildroot}%{tde_datadir}/icons/nuvola/ + + +%clean +%__rm -rf %{buildroot} + + + + +%files +%defattr(-,root,root,-) +%doc author license.txt readme.txt +%{tde_datadir}/icons/nuvola/ + + +%changelog diff --git a/redhat/extras/kdebluetooth/kdebluetooth.spec b/redhat/extras/kdebluetooth/kdebluetooth.spec index 25b95d31b..48e255d67 100644 --- a/redhat/extras/kdebluetooth/kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/kdebluetooth.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -22,7 +17,7 @@ Name: trinity-kdebluetooth Version: 1.0_beta9_r769275 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Summary: The TDE Bluetooth Framework @@ -124,7 +119,7 @@ KDE Bluetooth framework development libraries and headers. -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -321,175 +316,3 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %changelog -* Sat Sep 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-2 -- Rebuilt for Mageia 2 and Mandriva 2011 -- Drops useless '-libs' package -- Correctly applies Ubuntu patches -- Fix support for Bluez4 - -* Sun Feb 12 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-1 -- Initial version for TDE 3.5.13 -- Updates base version to 1.0_beta9_r769275 (taken from Ubuntu Hardy) -- Fix autotools detection - -* Tue Apr 1 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.0-0.41.beta8 -- -devel: Requires: kdelibs3-devel - -* Sun Jan 6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.beta8 -- Fix build with gcc 4.3. - -* Sun Dec 9 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.beta8 -- Require kdesu in main package. - -* Sun Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0-0.38.beta8 -- BR: kdelibs3-devel kdepim3-devel -- drop Requires: kdebase (?) - -* Wed Nov 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1.0-0.37.beta8 -- Missing BR: automake, autoconf. - -* Wed Nov 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-36.beta8 -- Move BRs to main package to fix mock breakage. - -* Wed Nov 07 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-35.beta8 -- Fix multi-lib conflicts (#341731). - -* Sat Oct 06 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-34.beta8 -- Beta8. (First official release since beta3) -- Remove redundant beta3 patches. -- LANG support by Ville Skytta. -- Virtual provides: dbus-bluez-pin-helper. - -* Sun Aug 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-33.beta3 -- Re-Fix the license tag. - -* Sun Aug 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-32.beta3 -- Fixed license tag. -- Re-enable PPC64. - -* Tue Jul 31 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-31.beta3 -- Fix error in ExcludeArch. - -* Tue Jul 31 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-30.beta3 -- ExcludeArch ppc64 (obexftp, again) - -* Mon Jul 30 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-29.beta3 -- ExcludeArch ppc/ppc64 (obexftp missing.) - -* Sun Jul 15 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-28.beta3 -- Fix %%dist... again... - -* Thu Jul 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-27.beta3 -- Add missing touch /icon/hicolor. -- Menu items: Remove only-in-KDE. -- BR: Remove libutempter-devel. -- Fix project URL and source URL. -- Add missing %%dist. - -* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-26.beta3 -- Remove the Nokia N70 patch. (Doesn't seem to work.) -- OBEX Object push fix. - -* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-25.beta3 -- Adopted Ville Skyttä b2 patch to b3. (Hopefully) re-enable Nokia N7x obex support. -- Patch out "Configure services". (Disabled in B3) - -* Mon Jun 25 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-24.beta3 -- Added hex encoding patch by Thomas Davis. -- Removed --enable-irmcsynckonnector (deprecated in b3) -- Add missing docs. (Removed by mistake in b23) -- Known issue - services menu doesn't seem to work. (Requires debugging / upstream ) - -* Tue Jun 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-23.beta3 -- Beta3. -- Remove pin-helper. (No longer needed - beta3 has dbus support.) -- Added BR dbus-qt. -- Added BR obexftp-devel. -- Remove b2 patches. - -* Sat May 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.22.beta2 -- Use the bluez_pinhelper wrapper instead of modified bluez-utils. -- Remove %%dist. -- *rc should not be marked as config. -- Prevent RPM from owning Network/Peripherals. - -* Mon Apr 23 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.21.beta2 -- Patch list clean-up. -- Add Nokia obex detection patch. -- Fix 64bit compile due to bad default in configure. (with_bluetooth_dir) -- Missing BR: libtempter-devel. -- Missing BT: libidn-devel. -- Added: kbluepin wrapper - cotde_datadirnfigure kbluepin as the old-style pin helper. - -* Wed Apr 04 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.20.beta2 -- Re-merge Ville Skytta's latest .spec. (Got dropped by mistake) -- Summery, description clean-up. - -* Thu Mar 29 2007 Gilboa Davara <gilboad[AT]gmail.com> 1.0-0.19.beta2 -- Spec file clean-up. - -* Fri Oct 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.18.beta2 -- BR: gettext -- include locales - -* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.17.beta2 -- kdebluetooth-1.0_beta2 - -* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.16.20060908svn -- kdebluetoooth-20060908svn - -* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.15.20060621svn -- put svn at end of Release tag (per packaging guidelines) - -* Wed Jun 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.14.svn20060621 -- kdebluetooth-20060621svn, fixes - compile error kdebluetooth libkobex obex.h not found (kde bug #94572) - -* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.13.svn20060620 -- kdebluetooth-svn20060620, (re)fixes - konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607) -- --disable-dependency-tracking -- own %%_datadir/applnk/Settings/Network - -* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.12.svn20060619 -- document svn tarball creation -- Requires: kdebase (for kcm bits, applnk dir ownership) -- desktop-file-install --add-only-show-in=KDE - -* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.11.svn20060619 -- kdebluetooth-svn20060619, making most patches obsolete - -* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.10.beta1 -- -devel: Requires: qt-devel bluez-libs-devel -- include libirmcsynckonnector.so in main pkg -- .desktop: --remove-category=Network --add-category=System -- remove zero length files -- fix default hcid start/top command - -* Mon Apr 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.beta1 -- konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607) - -* Tue Mar 28 2006 Rex Dieter 1.0-0.8.beta1 -- BR: kdepim-devel (for kitchensync) -- kdebluetooth-1.0_beta1-gcc41.patch - -* Thu Mar 23 2006 Rex Dieter 1.0-0.7.beta1 -- cleanup openobex patch -- fixup .desktop file(s) - -* Wed Mar 22 2006 Rex Dieter 1.0-0.6.beta1 -- cleanup for Extras -- %%post: ldconfig, fdo icon spec - -* Mon Mar 06 2006 Rex Dieter 1.0-0.5.beta1 -- respin - -* Mon Mar 21 2005 Rex Dieter 1.0-0.3.beta1 -- --enable-irmcsynckonnector - -* Mon Mar 21 2005 Rex Dieter 1.0-0.1.beta1 -- 1.0_beta1 - -* Wed Dec 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.0-0.1.cvs20050110 -- first try - diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon-14.0.0.spec new file mode 100644 index 000000000..d06d0c0ea --- /dev/null +++ b/redhat/extras/kdevmon/kdevmon-14.0.0.spec @@ -0,0 +1,150 @@ +# +# spec file for package kdevmon (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/ +# + +# Default version for this component +%define tde_pkg kdevmon +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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 utility for monitoring the throughput of one network device +Version: 0.4.6 +Release: %{?!preversion:1}%{?preversion:0_%{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: %{tde_pkg}-%{tde_version}.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 2:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + + +%description +Kdevmon is a utility for TDE that monitors the throughput of a network device. +It docks in Kicker (the panel of TDE) and shows the current network traffic +as a diagram. There also is a resizable main window that provides a larger +traffic diagram and displays the current net speed in bits per second. +Middle-clicking on the dock window or on the main window offers +you an overview of the amount of incoming/outgoing bits and the current and +the maximum bit rate. + +%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 +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 \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +for f in 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 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 COPYING +%{tde_bindir}/kdevmon +%{tde_datadir}/applnk/Internet/kdevmon.desktop +%{tde_tdedocdir}/HTML/en/kdevmon/ +%{tde_datadir}/icons/locolor/16x16/apps/kdevmon.png +%{tde_datadir}/icons/locolor/32x32/apps/kdevmon.png + + +%changelog diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec index ee835164b..fa35b7738 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com @@ -64,7 +59,7 @@ kickoff translations -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -94,8 +89,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %defattr(-,root,root,-) %changelog -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Initial release for TDE 3.5.13.1 - -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec index a0e684814..fbf315bb9 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com @@ -64,7 +59,7 @@ kickoff translations -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -94,11 +89,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %defattr(-,root,root,-) %changelog -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Initial release for TDE 3.5.13.1 - -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec index eb4540bd2..426fead6a 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -19,7 +14,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com @@ -56,7 +51,7 @@ kickoff translations -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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -85,5 +80,3 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %defattr(-,root,root,-) %changelog -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec new file mode 100644 index 000000000..e60e67731 --- /dev/null +++ b/redhat/extras/klamav/klamav-14.0.0.spec @@ -0,0 +1,173 @@ +# +# spec file for package klamav (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/ +# + +# Default version for this component +%define tde_pkg klamav +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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: Frontend for clamav +Version: 0.46 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +#URL: http://www.trinitydesktop.org/ +Url: http://klamav.sourceforge.net/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{tde_pkg}-%{tde_version}.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 2:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext +BuildRequires: curl-devel +BuildRequires: gmp-devel +BuildRequires: sqlite-devel +#BuildRequires: unsermake +BuildRequires: fdupes + +BuildRequires: clamav +Requires: clamav + +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} == 1330 +BuildRequires: clamav-devel +%endif + + +%description +A TDE front-end for the Clam AntiVirus antivirus toolkit. + +%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 +export PATH="%{tde_bindir}:${PATH}" + +# Warning: --enable-final causes FTBFS +%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 \ + --disable-gcc-hidden-visibility \ + \ + --without-included-sqlite \ + --with-extra-includes=%{_includedir}/tqt + +find . -name "*.cpp" | while read f; do + mf="${f%.cpp}.moc" + if grep -qw "${mf##*/}" "${f}" && [ ! -f "${mf}" ]; then + tqmoc "${f%.cpp}.h" -o "${mf}" + fi +done + +%__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 +for f in hicolor ; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done + + +%postun +for f in 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,-) +%{tde_bindir}/ScanWithKlamAV +%{tde_bindir}/klamarkollon +%{tde_bindir}/klamav +%{tde_bindir}/klammail +%{tde_tdeappdir}/klamav.desktop +%{tde_datadir}/apps/klamav/ +%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop +%{tde_datadir}/config.kcfg/klamavconfig.kcfg +%{tde_tdedocdir}/HTML/en/klamav02/ +%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png +%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png + + +%changelog diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido-14.0.0.spec new file mode 100644 index 000000000..be9338c85 --- /dev/null +++ b/redhat/extras/klibido/klibido-14.0.0.spec @@ -0,0 +1,143 @@ +# +# spec file for package klibido (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/ +# + +# Default version for this component +%define tde_pkg klibido +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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 TDE usenet news grabber for Linux. +Version: 0.2.5 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPL +Group: Applications/Network + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://klibido.sourceforge.net/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{tde_pkg}-%{tde_version}.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 2:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: uulib-devel + + +%description +KLibido is a TDE program to download encoded articles from the usenet news +service, using the nntp protocol. It supports multiple servers, multiple +download threads per server, automatic joining and decoding of articles. + +KLibido is not a NewsReader. It doesn't let you easily display the articles - +only their subject, and it discards all non-binary posts. If you want a nice +newsreader for TDE, try KNode. + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL NEWS README RELEASE TODO +%{tde_bindir}/klibido +%{tde_tdeappdir}/klibido.desktop +%{tde_datadir}/apps/klibido/ +%{tde_datadir}/doc/tde/HTML/en/klibido/ +%{tde_datadir}/icons/hicolor/*/apps/klibido.png +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/klibido.mo + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +export PATH="%{tde_bindir}:${PATH}" + +if [ -r /usr/include/db53/db_cxx.h ]; then + EXTRA_INCLUDES="/usr/include/db53" +fi + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=%{_includedir}/uulib:${EXTRA_INCLUDES} + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file klibido News +%endif + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%changelog diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec index 8f643cd31..7b5ddfc28 100644 --- a/redhat/extras/knoda/trinity-knoda.spec +++ b/redhat/extras/knoda/trinity-knoda.spec @@ -1,13 +1,10 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - - # TDE 3.5.13 specific building variables +%define tde_version 14.0.1 %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share +%define tde_confdir %{_sysconfdir}/trinity %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} @@ -22,7 +19,7 @@ Name: trinity-knoda Version: 0.8.3 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: A database frontend for TDE. Group: Applications/Productivity @@ -30,7 +27,7 @@ License: GPLv2+ URL: http://sourceforge.net/projects/knoda/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.gz +Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-%{tde_version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: trinity-tdelibs-devel @@ -51,7 +48,7 @@ Requires: %{name} = %{version}-%{release} %{summary} -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -60,13 +57,14 @@ Requires: %{name} = %{version}-%{release} %setup -q -n knoda-%{version} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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}" %configure \ @@ -138,7 +136,7 @@ done %{tde_datadir}/applnk/Office/knoda.desktop %{tde_datadir}/apps/hk_kdeclasses/ %{tde_datadir}/apps/knoda/ -%{tde_datadir}/config/magic/hk_classes.magic +%{tde_confdir}/magic/hk_classes.magic %{tde_tdedocdir}/HTML/en/knoda/ %{tde_datadir}/icons/hicolor/*/apps/knoda.png %{tde_datadir}/icons/locolor/*/apps/knoda.png @@ -238,5 +236,3 @@ done %changelog -* Mon Apr 08 2013 Francois Andriot <francois.andriot@free.fr> - 0.5b-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose-14.0.0.spec new file mode 100644 index 000000000..74719a3bf --- /dev/null +++ b/redhat/extras/kompose/kompose-14.0.0.spec @@ -0,0 +1,151 @@ +# +# spec file for package kompose (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/ +# + +# Default version for this component +%define tde_pkg kompose +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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: Full-Screen Task Manager for TDE +Version: 0.5.3 +Release: %{?!preversion:1}%{?preversion:0_%{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: %{tde_pkg}-%{tde_version}.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: imlib2-devel + + +%description +Kompose creates a full-screen view in which every window is represented +by a scaled screen shot of it. It appears as a panel applet. + + +%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 +export PATH="%{tde_bindir}:${PATH}" + +# Warning: --enable-final causes FTBFS +%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 \ + --disable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%post +for f in 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 hicolor ; 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 TODO README AUTHORS ChangeLog COPYING +%{tde_bindir}/kompose +%{tde_datadir}/applnk/Utilities/kompose.desktop +%{tde_datadir}/apps/kompose/ +%{tde_tdedocdir}/HTML/en/kompose/ +%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png +%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png + + +%changelog diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist-14.0.0.spec new file mode 100644 index 000000000..d638d93a2 --- /dev/null +++ b/redhat/extras/koverartist/koverartist-14.0.0.spec @@ -0,0 +1,154 @@ +# +# spec file for package koverartist (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/ +# + +# Default version for this component +%define tde_pkg koverartist +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%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}/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: Fast Creation of CD/DVD Covers +Version: 0.5 +Release: %{?!preversion:1}%{?preversion:0_%{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: %{tde_pkg}-%{tde_version}.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 +KoverArtist is a program for the fast creation of covers for +cd/dvd cases and boxes. The main idea behind it is to be able +to create decent looking covers with some mouseclicks. + + +%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 +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 \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%post +for f in 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 hicolor ; 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,-) +%{tde_bindir}/koverartist +%{tde_datadir}/applnk/Multimedia/koverartist.desktop +%{tde_datadir}/apps/koverartist/ +%{tde_tdedocdir}/HTML/en/koverartist/ +%{tde_datadir}/icons/hicolor/128x128/apps/koverartist.png +%{tde_datadir}/icons/hicolor/16x16/apps/koverartist.png +%{tde_datadir}/icons/hicolor/22x22/apps/koverartist.png +%{tde_datadir}/icons/hicolor/32x32/apps/koverartist.png +%{tde_datadir}/icons/hicolor/48x48/apps/koverartist.png +%{tde_datadir}/icons/hicolor/64x64/apps/koverartist.png +%{tde_datadir}/mimelnk/application/x-koverartist.desktop + + +%changelog diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec new file mode 100644 index 000000000..64b54ba35 --- /dev/null +++ b/redhat/extras/kpacman/kpacman-14.0.0.spec @@ -0,0 +1,158 @@ +# +# spec file for package kpacman (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/ +# + +# Default version for this component +%define tde_pkg kpacman +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif + +# TDE specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_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 pacman game for the Trinity Desktop. +Version: 0.3.2 +Release: %{?!preversion:1}%{?preversion:0_%{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: %{tde_pkg}-%{tde_version}.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-libtdegames-devel >= %{tde_version} + +BuildRequires: gettext + + +%description +Pacman is a legendary game with an enthusiastic following from around +the world. Since its introduction in 1980, Pacman's image has been +splashed across magazine covers, television screens, T-shirts, and +bumper stickers. Created by Japan's Namco, and distributed in the +United States by Bally, Pacman is an icon of 1980's popular culture + +%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 +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} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{tde_pkg} + +%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 + + +%changelog diff --git a/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec b/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec index 8ef5c62b3..23f4f2dfa 100644 --- a/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec +++ b/redhat/extras/trinity-cmake-macros/trinity-cmake-macros.spec @@ -36,5 +36,3 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Sep 29 2014 François Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial build for openSUSE diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo index f3cb8e34f..7a292aa39 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo @@ -1,23 +1,23 @@ [trinity-3.5.13] name=trinity-3.5.13 -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-source -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo index c3450eaed..f415f006a 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo @@ -1,23 +1,23 @@ [trinity-3.5.13] name=trinity-3.5.13 -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-noarch -#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS -mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index a93b07673..5a27ceb5e 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -1,23 +1,48 @@ +# +# spec file for package trinity-desktop (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/ +# + # Starting with TDE R14.0.0, TDE is not intended to run in RHEL4 and older. # Minimum (oldest) distribution supported is RHEL5. +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop -Version: 14.0.0 -Release: 1%{?dist}%{?_variant} -License: GPL +Version: %{tde_version} +Release: 1%{?dist} Summary: Meta-package to install TDE Group: User Interface/Desktops +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> -URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,8 +118,6 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-k3b -Requires: trinity-k9copy Requires: trinity-kaffeine Requires: trinity-kaffeine-mozilla Requires: trinity-kasablanca @@ -106,19 +129,15 @@ Requires: trinity-kbiff Requires: trinity-kbookreader Requires: trinity-kchmviewer Requires: trinity-kcmautostart -Requires: trinity-kcmldap -Requires: trinity-kcmldapcontroller -Requires: trinity-kcmldapmanager Requires: trinity-kcpuload Requires: trinity-kdbg Requires: trinity-kdbusnotification Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep -Requires: trinity-kerberostray +Requires: trinity-keximdb Requires: trinity-kftpgrabber Requires: trinity-kile -Requires: trinity-kima Requires: trinity-kiosktool Requires: trinity-kkbswitch Requires: trinity-klcddimmer @@ -134,8 +153,10 @@ Requires: trinity-knmap Requires: trinity-knutclient Requires: trinity-koffice-suite Requires: trinity-konversation +Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim +Requires: trinity-kplayer Requires: trinity-krecipes Requires: trinity-krename Requires: trinity-krusader @@ -153,13 +174,18 @@ Requires: trinity-kuickshow Requires: trinity-kvirc Requires: trinity-kvkbd Requires: trinity-kvpnc +Requires: trinity-kxmleditor Requires: trinity-mplayerthumbs Requires: trinity-piklab Requires: trinity-potracegui Requires: trinity-smb4k Requires: trinity-smartcardauth Requires: trinity-soundkonverter +Requires: trinity-tastymenu Requires: trinity-tde-guidance +Requires: trinity-tde-style-baghira +Requires: trinity-tde-style-domino +Requires: trinity-tde-style-ia-ora Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve Requires: trinity-tde-systemsettings @@ -171,7 +197,6 @@ Requires: trinity-tdeio-umountwrapper Requires: trinity-tderadio Requires: trinity-tdesvn Requires: trinity-tdmtheme -Requires: trinity-tellico Requires: trinity-tork Requires: trinity-twin-style-crystal Requires: trinity-wlassistant @@ -182,27 +207,40 @@ Requires: trinity-yakuake Requires: trinity-tdesudo %endif -# RHEL5: pilot library is too old +# PCLinuxOS and RHEL 5 don't have heimdal ... %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?pclinuxos} == 0 +Requires: trinity-kcmldap +Requires: trinity-kcmldapcontroller +Requires: trinity-kcmldapmanager +Requires: trinity-kerberostray +%endif +%endif + +# RHEL5: UDEV is too old +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: trinity-k3b +Requires: trinity-k9copy +Requires: trinity-kima Requires: trinity-kpilot +Requires: trinity-tellico +Requires: trinity-tdepowersave %endif # Network management # RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 Requires: trinity-knetworkmanager %endif # Other distros use tdenetworkmanager (since R14) -%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} Requires: trinity-tdenetworkmanager +Obsoletes: trinity-knetworkmanager +Obsoletes: trinity-knetworkmanager8 %endif # Power management Obsoletes: trinity-tde-guidance-powermanager -Requires: trinity-tdepowersave # Decoration-related stuff (not installed by default) #Requires: trinity-kgtk-qt3 @@ -210,9 +248,13 @@ Requires: trinity-tdepowersave #Requires: trinity-gtk3-tqt-engine #Requires: trinity-qt4-tqt-theme-engine +# Missing qalculate on older RHEL ... +%if 0%{?rhel} == 0 || 0%{?rhel} >= 7 +Requires: trinity-qalculate-tde +%endif + # On RHEL 5/7, lilypond is not available, so no rosegarden :'-( -%if 0%{?rhel} == 5 || 0%{?rhel} == 7 -%else +%if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} Requires: trinity-rosegarden %endif @@ -246,24 +288,28 @@ Requires: trinity-rosegarden Group: User Interface/Desktops Summary: Meta-package to install all extras (unofficial) TDE packages -Requires: trinity-akode -#Requires: trinity-kdebluetooth -#Requires: trinity-kcheckgmail Requires: trinity-icons-crystalsvg-updated Requires: trinity-icons-kfaenza +Requires: trinity-icons-nuvola Requires: trinity-icons-oxygen -Requires: trinity-kickoff-i18n -#Requires: trinity-knoda -Requires: trinity-style-ia-ora +#Requires: trinity-kickoff-i18n +#Requires: trinity-kcheckgmail +#Requires: trinity-kdebluetooth +Requires: trinity-kdevmon +Requires: trinity-kdissert +Requires: trinity-klamav +Requires: trinity-knoda +Requires: trinity-kompose +Requires: trinity-koverartist +Requires: trinity-kpacman +Requires: trinity-mathemagics #Requires: trinity-tdeio-sysinfo-plugin -Requires: trinity-theme-baghira - -# GLIBC too old on RHEL <= 5 -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -Requires: trinity-twinkle +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: trinity-klibido %endif + %description extras %{summary} @@ -310,8 +356,10 @@ Requires(pre): coreutils %prep + %build + %install %__rm -rf %{?buildroot} %__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d" @@ -344,5 +392,3 @@ Requires(pre): coreutils %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial build for TDE R14 diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec index 3ebb6f2a1..80eef7416 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec @@ -1,13 +1,12 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: 3.5.13.2 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -80,27 +79,9 @@ Requires: trinity-tdewebdev >= %{version} Group: User Interface/Desktops Summary: Meta-package to install all TDE applications -# Some applications are disabled for now ... -# Compiz-related stuff does not work (obsolete) -#Requires: trinity-compizconfig-backend-kconfig -#Requires: trinity-desktop-effects-kde -#Requires: trinity-fusion-icon - -# Obsolete l10n package -#Requires: trinity-filelight-l10n - -# Not even an RPM package ... -#Requires: trinity-konstruct - -# Debian/Ubuntu specific ... -#Requires: trinity-adept - -# Future R14 packages -#Requires: trinity-kvpnc -#Requires: trinity-qt4-tqt-theme-engine - # Warning, k9copy requires ffmpeg # Warning, tderadio requires libmp3lame + Requires: trinity-abakus Requires: trinity-amarok Requires: trinity-basket @@ -109,8 +90,8 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -#Requires: trinity-gwenview-i18n Requires: trinity-k3b +Requires: trinity-k9copy Requires: trinity-kaffeine Requires: trinity-kaffeine-mozilla Requires: trinity-katapult @@ -119,7 +100,6 @@ Requires: trinity-kbfx Requires: trinity-kbookreader Requires: trinity-kchmviewer Requires: trinity-kcpuload -Requires: trinity-k9copy Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep @@ -147,22 +127,22 @@ Requires: trinity-ktorrent Requires: trinity-kuickshow Requires: trinity-kvirc Requires: trinity-kvkbd -Requires: trinity-twin-style-crystal Requires: trinity-piklab Requires: trinity-potracegui Requires: trinity-smb4k Requires: trinity-smartcardauth Requires: trinity-soundkonverter Requires: trinity-tde-guidance -Requires: trinity-tde-guidance-powermanager Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve Requires: trinity-tde-systemsettings Requires: trinity-tdeio-apt Requires: trinity-tdeio-locate Requires: trinity-tdeio-umountwrapper +Requires: trinity-tderadio Requires: trinity-tdmtheme Requires: trinity-tellico +Requires: trinity-twin-style-crystal Requires: trinity-wlassistant Requires: trinity-yakuake @@ -171,42 +151,46 @@ Requires: trinity-yakuake Requires: trinity-tdesudo %endif -# Disabled applications for RHEL5 +# RHEL5: pilot library is too old +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: trinity-kpilot +%endif + +# Network management +# RHEL 6 and openSUSE 11.x: knetworkmanager8 +%if 0%{?rhel} == 6 +Requires: trinity-knetworkmanager +%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +Requires: trinity-knetworkmanager +%endif + +# Power management +Requires: trinity-tde-guidance-powermanager %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} # On RHEL 5, HAL version is too old for kpowersave . Requires: trinity-kpowersave -# On RHEL 5, GTK2 version is too old for GTK stuff ... -Requires: trinity-gtk-qt-engine -# RHEL5: kpilot library is too old -Requires: trinity-kpilot %endif +# Decoration-related stuff (not installed by default) +#Requires: trinity-kgtk-qt3 +#Requires: trinity-gtk-qt-engine +#Requires: trinity-gtk3-tqt-engine +#Requires: trinity-qt4-tqt-theme-engine + # On RHEL 5/7, lilypond is not available, so no rosegarden :'-( %if 0%{?rhel} == 5 || 0%{?rhel} == 7 %else Requires: trinity-rosegarden %endif -# On RHEL 7, lirc is not available, so not tderaiod :'-( -%if 0%{?rhel} != 7 -Requires: trinity-tderadio -%endif - -# This one causes several crashes . Obsolete. -#Requires: trinity-kgtk-qt3 -#Obsoletes: trinity-kgtk-qt3 - -# OBSOLETE: beagle does not exist anymore. Kerry is now useless. -# RHEL, openSUSE 12: no Beagle library -Obsoletes: trinity-kerry +# Compiz-related stuff does not work (obsolete) +#Requires: trinity-compizconfig-backend-kconfig +#Requires: trinity-desktop-effects-kde +#Requires: trinity-fusion-icon -# RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 -Requires: trinity-knetworkmanager -%endif +# Useless l10n package +#Requires: trinity-filelight-l10n # RHEL 4 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -216,7 +200,7 @@ Requires: trinity-kmplayer # No OTR support Requires: trinity-kopete-otr # No DBUS support -Requires: trinity-kdbusnotification +Requires: trinity-kdbusfnotification # Subversion 1.1 is too old Requires: trinity-tdesvn %endif @@ -344,29 +328,3 @@ Requires(pre): coreutils %changelog -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Update for RHEL4 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Update to version 3.5.13.2 -- Add GPG signing key - -* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Update to version 3.5.13.1 - -* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 -- Add 'applications' subpackage - -* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Updates to reflect new packages names -- Add Mageia 2 support -- Removes 'extras' packages - -* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Enable mirrorlist - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Fix repo files name and content - -* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Add 'repo' package diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 76871022c..a999adda0 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package trinity-filesystem (version R14.0.0) +# spec file for package trinity-filesystem (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,13 +12,16 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define _docdir %{tde_docdir} %define tde_docdir %{tde_datadir}/doc @@ -30,7 +33,6 @@ %define tde_tdelibdir %{tde_libdir}/trinity - Name: trinity-filesystem Version: %{tde_version} Release: 1%{?dist} @@ -63,14 +65,14 @@ This package installs the Trinity directory structure. %dir %{tde_bindir} %dir %{tde_datadir} -%dir %{tde_datadir}/config -%dir %{tde_datadir}/config/magic +%dir %{tde_confdir} +%dir %{tde_confdir}/magic %dir %{tde_docdir} %dir %{tde_tdedocdir} %dir %{tde_tdedocdir}/HTML -%dir %{tde_tdedocdir}/HTML/en -%dir %{tde_tdedocdir}/HTML/en/common +%dir %{tde_tdedocdir}/HTML/* +%dir %{tde_tdedocdir}/HTML/*/common %dir %{tde_includedir} %dir %{tde_tdeincludedir} @@ -108,6 +110,8 @@ This package installs the Trinity directory structure. %dir %{tde_datadir}/locale/*/* %dir %{tde_datadir}/man %dir %{tde_datadir}/man/* +%dir %{tde_datadir}/mime +%dir %{tde_datadir}/mime/* %dir %{tde_datadir}/mimelnk %dir %{tde_datadir}/mimelnk/* %dir %{tde_datadir}/services @@ -159,13 +163,14 @@ This package installs the Trinity directory structure. %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles +%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remotes %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart %__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic +%__install -d -m 755 %{?buildroot}%{tde_confdir} +%__install -d -m 755 %{?buildroot}%{tde_confdir}/magic %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale @@ -179,6 +184,8 @@ This package installs the Trinity directory structure. %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man7 %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man8 %__install -d -m 755 %{?buildroot}%{tde_datadir}/man/man9 +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mime +%__install -d -m 755 %{?buildroot}%{tde_datadir}/mime/packages %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/all %__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/application @@ -206,7 +213,7 @@ This package installs the Trinity directory structure. for t in crystalsvg hicolor locolor ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}" %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable" - for i in {16,22,32,48,64,128} ; do + for i in {16,22,32,48,64,128,256} ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" done @@ -221,9 +228,37 @@ done %__install -d -m 755 %{?buildroot}%{tde_docdir} %__install -d -m 755 %{?buildroot}%{tde_tdedocdir} + +# HTML directories %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML -%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ca/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/cs/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/da/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/de/common %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/en_GB/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/es/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/et/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fi/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fr/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/he/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ja/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nl/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pl/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt_BR/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ro/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ru/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sk/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sl/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sv/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_CN/common +%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_TW/common %__install -d -m 755 %{?buildroot}%{tde_includedir} %__install -d -m 755 %{?buildroot}%{tde_tdeincludedir} @@ -237,6 +272,7 @@ done %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity %__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus +# Locales directories %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/en_US %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/l10n/C @@ -513,6 +549,7 @@ done %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/km/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ko/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ku/LC_MESSAGES/ +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/lo/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/lt/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/mk/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ms/LC_MESSAGES/ @@ -550,6 +587,7 @@ done %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk@cyrillic/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz/LC_MESSAGES/ +%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz@cyrillic/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ven/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/vi/LC_MESSAGES/ %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/xh/LC_MESSAGES/ @@ -572,5 +610,3 @@ done %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial build for TDE R14 diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec index 4ded620a5..5a8e7f9b0 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -482,5 +482,3 @@ done %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial build for TDE R14 diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec index fd61344ff..4864df6ce 100644 --- a/redhat/extras/trinity-live/trinity-live.spec +++ b/redhat/extras/trinity-live/trinity-live.spec @@ -75,20 +75,3 @@ EOF %changelog -* Sun Oct 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 - -* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Updates with new split packages - -* Sat Jan 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Start kmix automatically in LiveCD -- Add 'yumex' package manager - -* Mon Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- More TDE 3.5.13 specific visual settings -- Updates all packages to fix TDE bugs -- Add more applications - -* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec new file mode 100644 index 000000000..6f953fb06 --- /dev/null +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -0,0 +1,388 @@ +# +# spec file for package kipi-plugins (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 kipi-plugins +%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/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define kipi-plugins %{_lib}kipi +%else +%define kipi-plugins kipi-plugins +%endif + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.1.6 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Image manipulation/handling plugins for KIPI aware programs [Trinity] +Group: System/Libraries +URL: http://www.trinitydesktop.org/ +#URL: http://www.kipi-plugins.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdepim-devel >= %{tde_version} +BuildRequires: trinity-libkdcraw-devel >= %{tde_version} +BuildRequires: trinity-libkexiv2-devel >= %{tde_version} +BuildRequires: trinity-libkipi-devel >= %{tde_version} + +BuildRequires: desktop-file-utils +BuildRequires: pkgconfig +BuildRequires: gettext +BuildRequires: gcc-c++ + +# JPEG support +BuildRequires: libjpeg-devel + +# 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 + +# 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 + +# LCMS support +%if 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: liblcms-devel +%else +BuildRequires: lcms-devel +%endif + +# GPHOTO2 support +%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: gphoto2-devel +%else +BuildRequires: libgphoto2-devel +%endif + +# TIFF support +BuildRequires: libtiff-devel + +# XSLT support +BuildRequires: libxslt-devel + +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: MesaGLU-devel +%else +BuildRequires: mesaglu-devel +%endif +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel +%endif + +# 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 +KIPI plugins (TDE Image Plugin Interface) is an effort to develop a +common plugin structure for Digikam, KPhotoAlbum (formerly known as +KimDaBa), Showimg and Gwenview. +Its aim is to share image plugins among graphic applications. + +Plugins available are: + +RawConverter: Raw image converter for digital cameras +SlideShow: Slideshow with effects ripped out from kslideshow + and 3D effects using OpenGL +MpegEncoder: Create an MPEG slideshow from your images +PrintWizard: A wizard to print images in various format +JpegLossLess: Batch process your JPEG images without losing meta + information and compression +CdArchiving: Archive your albums on CD or DVD using K3b +ScanImages: Scanner management using Kooka +ScreenshotImages: Snap screen based on KSnapshot and adapted to Kipi +Calendar: Sreate calendars with images +SendImages: Send images by email, allowing resizing + and recompressing before sending +RenameImages: Batch image renamer +ConvertImages: Batch image converter +BorderImages: Add border to your images in batch +FilterImages: Batch image enhancer using digital filters +ColorImages: Batch image color enhancer +EffectImages: Batch image transformation effects +ResizeImages: Batch image resizer +RecompressImages: Batch image recompressor +FindDuplicateImages: Find duplicate images in albums +TimeAdjust: Adjust image file time and date +WallPaper: Set your image as wallpaper +FindImages: Find duplicate images in albums +GalleryExport: Interface for export images collections to remote + Gallery (and Gallery 2) servers +FlickrExport: Export images to a remote Flickr web service +HTMLGallery: Export images to HTML +SimpleviewerExport: Export images in a nice flash movie +GPSSync: Geolocalize pictures +MetadataEdit: Edit EXIF and IPTC pictures metadata +%if 0%{?with_gpod} +IpodExport: Export images to an ipod device +%endif +PicasaWebExport: Export pictures to Picasa web service + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%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 +export PATH="%{tde_bindir}:${PATH}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --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 \ + --disable-gcc-hidden-visibility + +%__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}/images2mpg +%{tde_libdir}/libkipiplugins.la +%{tde_libdir}/libkipiplugins.so +%{tde_libdir}/libkipiplugins.so.0 +%{tde_libdir}/libkipiplugins.so.0.0.1 +%{tde_tdelibdir}/kipiplugin_acquireimages.la +%{tde_tdelibdir}/kipiplugin_acquireimages.so +%{tde_tdelibdir}/kipiplugin_batchprocessimages.la +%{tde_tdelibdir}/kipiplugin_batchprocessimages.so +%{tde_tdelibdir}/kipiplugin_calendar.la +%{tde_tdelibdir}/kipiplugin_calendar.so +%{tde_tdelibdir}/kipiplugin_cdarchiving.la +%{tde_tdelibdir}/kipiplugin_cdarchiving.so +%{tde_tdelibdir}/kipiplugin_findimages.la +%{tde_tdelibdir}/kipiplugin_findimages.so +%{tde_tdelibdir}/kipiplugin_flickrexport.la +%{tde_tdelibdir}/kipiplugin_flickrexport.so +%{tde_tdelibdir}/kipiplugin_galleryexport.la +%{tde_tdelibdir}/kipiplugin_galleryexport.so +%{tde_tdelibdir}/kipiplugin_gpssync.la +%{tde_tdelibdir}/kipiplugin_gpssync.so +%{tde_tdelibdir}/kipiplugin_htmlexport.la +%{tde_tdelibdir}/kipiplugin_htmlexport.so +%if 0%{?with_gpod} +%{tde_tdelibdir}/kipiplugin_ipodexport.la +%{tde_tdelibdir}/kipiplugin_ipodexport.so +%endif +%{tde_tdelibdir}/kipiplugin_jpeglossless.la +%{tde_tdelibdir}/kipiplugin_jpeglossless.so +%{tde_tdelibdir}/kipiplugin_kameraklient.la +%{tde_tdelibdir}/kipiplugin_kameraklient.so +%{tde_tdelibdir}/kipiplugin_metadataedit.la +%{tde_tdelibdir}/kipiplugin_metadataedit.so +%{tde_tdelibdir}/kipiplugin_mpegencoder.la +%{tde_tdelibdir}/kipiplugin_mpegencoder.so +%{tde_tdelibdir}/kipiplugin_picasawebexport.la +%{tde_tdelibdir}/kipiplugin_picasawebexport.so +%{tde_tdelibdir}/kipiplugin_printwizard.la +%{tde_tdelibdir}/kipiplugin_printwizard.so +%{tde_tdelibdir}/kipiplugin_rawconverter.la +%{tde_tdelibdir}/kipiplugin_rawconverter.so +%{tde_tdelibdir}/kipiplugin_sendimages.la +%{tde_tdelibdir}/kipiplugin_sendimages.so +%{tde_tdelibdir}/kipiplugin_simpleviewer.la +%{tde_tdelibdir}/kipiplugin_simpleviewer.so +%{tde_tdelibdir}/kipiplugin_slideshow.la +%{tde_tdelibdir}/kipiplugin_slideshow.so +%{tde_tdelibdir}/kipiplugin_timeadjust.la +%{tde_tdelibdir}/kipiplugin_timeadjust.so +%{tde_tdelibdir}/kipiplugin_viewer.la +%{tde_tdelibdir}/kipiplugin_viewer.so +%{tde_tdelibdir}/kipiplugin_wallpaper.la +%{tde_tdelibdir}/kipiplugin_wallpaper.so +%{tde_datadir}/applnk/.hidden/kipi-plugins.desktop +%{tde_datadir}/apps/kipi/ +%{tde_datadir}/apps/kipiplugin_batchprocessimages/ +%{tde_datadir}/apps/kipiplugin_findimages/ +%{tde_datadir}/apps/kipiplugin_galleryexport/ +%{tde_datadir}/apps/kipiplugin_gpssync/ +%{tde_datadir}/apps/kipiplugin_htmlexport/ +%{tde_datadir}/apps/kipiplugin_jpeglossless/ +%{tde_datadir}/apps/kipiplugin_rawconverter/ +%{tde_datadir}/apps/kipiplugin_simpleviewerexport/ +%{tde_datadir}/apps/kipiplugin_slideshow/ +%{tde_datadir}/apps/kipiplugin_viewer/ +%{tde_datadir}/config.kcfg/htmlexportconfig.kcfg +%{tde_datadir}/services/kipiplugin_acquireimages.desktop +%{tde_datadir}/services/kipiplugin_batchprocessimages.desktop +%{tde_datadir}/services/kipiplugin_calendar.desktop +%{tde_datadir}/services/kipiplugin_cdarchiving.desktop +%{tde_datadir}/services/kipiplugin_findimages.desktop +%{tde_datadir}/services/kipiplugin_flickrexport.desktop +%{tde_datadir}/services/kipiplugin_galleryexport.desktop +%{tde_datadir}/services/kipiplugin_gpssync.desktop +%{tde_datadir}/services/kipiplugin_htmlexport.desktop +%if 0%{?with_gpod} +%{tde_datadir}/services/kipiplugin_ipodexport.desktop +%endif +%{tde_datadir}/services/kipiplugin_jpeglossless.desktop +%{tde_datadir}/services/kipiplugin_kameraklient.desktop +%{tde_datadir}/services/kipiplugin_metadataedit.desktop +%{tde_datadir}/services/kipiplugin_mpegencoder.desktop +%{tde_datadir}/services/kipiplugin_picasawebexport.desktop +%{tde_datadir}/services/kipiplugin_printwizard.desktop +%{tde_datadir}/services/kipiplugin_rawconverter.desktop +%{tde_datadir}/services/kipiplugin_sendimages.desktop +%{tde_datadir}/services/kipiplugin_simpleviewer.desktop +%{tde_datadir}/services/kipiplugin_slideshow.desktop +%{tde_datadir}/services/kipiplugin_timeadjust.desktop +%{tde_datadir}/services/kipiplugin_viewer.desktop +%{tde_datadir}/services/kipiplugin_wallpaper.desktop +%{tde_mandir}/man1/images2mpg.1* +%{tde_tdedocdir}/HTML/de/kipi-plugins/ +%{tde_tdedocdir}/HTML/en/kipi-plugins/ +%{tde_tdedocdir}/HTML/es/kipi-plugins/ +%{tde_tdedocdir}/HTML/et/kipi-plugins/ +%{tde_tdedocdir}/HTML/it/kipi-plugins/ +%{tde_tdedocdir}/HTML/nl/kipi-plugins/ +%{tde_tdedocdir}/HTML/pt_BR/kipi-plugins/ +%{tde_tdedocdir}/HTML/ru/kipi-plugins/ +%{tde_tdedocdir}/HTML/sv/kipi-plugins/ +%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/*.mo +%lang(be) %{tde_datadir}/locale/be/LC_MESSAGES/*.mo +%lang(br) %{tde_datadir}/locale/br/LC_MESSAGES/*.mo +%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/*.mo +%lang(cs) %{tde_datadir}/locale/cs/LC_MESSAGES/*.mo +%lang(cy) %{tde_datadir}/locale/cy/LC_MESSAGES/*.mo +%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo +%lang(en_GB) %{tde_datadir}/locale/en_GB/LC_MESSAGES/*.mo +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo +%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo +%lang(fi) %{tde_datadir}/locale/fi/LC_MESSAGES/*.mo +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo +%lang(ga) %{tde_datadir}/locale/ga/LC_MESSAGES/*.mo +%lang(gl) %{tde_datadir}/locale/gl/LC_MESSAGES/*.mo +%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/*.mo +%lang(is) %{tde_datadir}/locale/is/LC_MESSAGES/*.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo +%lang(ja) %{tde_datadir}/locale/ja/LC_MESSAGES/*.mo +%lang(lt) %{tde_datadir}/locale/lt/LC_MESSAGES/*.mo +%lang(ms) %{tde_datadir}/locale/ms/LC_MESSAGES/*.mo +%lang(mt) %{tde_datadir}/locale/mt/LC_MESSAGES/*.mo +%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/*.mo +%lang(nds) %{tde_datadir}/locale/nds/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(nn) %{tde_datadir}/locale/nn/LC_MESSAGES/*.mo +%lang(pa) %{tde_datadir}/locale/pa/LC_MESSAGES/*.mo +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo +%lang(rw) %{tde_datadir}/locale/rw/LC_MESSAGES/*.mo +%lang(sk) %{tde_datadir}/locale/sk/LC_MESSAGES/*.mo +%lang(sr) %{tde_datadir}/locale/sr/LC_MESSAGES/*.mo +%lang(sr@Latn) %{tde_datadir}/locale/sr@Latn/LC_MESSAGES/*.mo +%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo +%lang(ta) %{tde_datadir}/locale/ta/LC_MESSAGES/*.mo +%lang(th) %{tde_datadir}/locale/th/LC_MESSAGES/*.mo +%lang(tr) %{tde_datadir}/locale/tr/LC_MESSAGES/*.mo +%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo +%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/*.mo + + +%changelog diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec index 8b792af4a..d3ad7ed60 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libkdcraw (version R14.0.0) +# spec file for package libkdcraw (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libkdcraw %define tde_prefix /opt/trinity %define tde_datadir %{tde_prefix}/share @@ -35,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Raw picture decoding C++ library (runtime) [Trinity] Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -64,7 +66,7 @@ BuildRequires: pkgconfig BuildRequires: gettext # LCMS support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel %else BuildRequires: lcms-devel @@ -108,12 +110,6 @@ libkdcraw contains the library of libkdcraw. %{tde_libdir}/libkdcraw.so.4 %{tde_libdir}/libkdcraw.so.4.0.3 -%post -n trinity-%{libkdcraw}4 -/sbin/ldconfig || : - -%postun -n trinity-%{libkdcraw}4 -/sbin/ldconfig || : - ########## %package -n trinity-libkdcraw-common @@ -131,18 +127,6 @@ libkdcraw contains the library of libkdcraw. %defattr(-,root,root,-) %{tde_datadir}/icons/hicolor/*/apps/kdcraw.png -%post -n trinity-libkdcraw-common -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-libkdcraw-common -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-%{libkdcraw}-devel @@ -166,12 +150,6 @@ library documentation is available on kdcraw.h header file. %{tde_tdeincludedir}/libkdcraw/ %{tde_libdir}/pkgconfig/libkdcraw.pc -%post -n trinity-%{libkdcraw}-devel -/sbin/ldconfig || : - -%postun -n trinity-%{libkdcraw}-devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -184,7 +162,7 @@ library documentation is available on kdcraw.h header file. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -228,6 +206,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.1.9-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec index 56c706a00..93e82bd9b 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkdcraw %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Summary: Raw picture decoding C++ library (runtime) [Trinity] Epoch: 1 Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries @@ -91,7 +86,7 @@ library documentation is available on kdcraw.h header file. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -167,9 +162,4 @@ done %{tde_tdeincludedir}/libkdcraw/ %{tde_libdir}/pkgconfig/libkdcraw.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.1.9-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index d10f2ba1d..26a35fb11 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libkexiv2 (version R14.0.0) +# spec file for package libkexiv2 (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libkexiv2 %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -34,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libkexiv %{_lib}kexiv %else @@ -47,11 +44,11 @@ Name: trinity-%{tde_pkg} -Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] -Group: System/Libraries Epoch: 2 Version: 0.1.7 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] +Group: System/Libraries URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -115,12 +112,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %{tde_libdir}/libkexiv2.so.5 %{tde_libdir}/libkexiv2.so.5.0.0 -%post -n trinity-%{libkexiv}2-5 -/sbin/ldconfig || : - -%postun -n trinity-%{libkexiv}2-5 -/sbin/ldconfig || : - ########## %package -n trinity-%{libkexiv}2-devel @@ -143,12 +134,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %{tde_tdeincludedir}/libkexiv2/ %{tde_libdir}/pkgconfig/libkexiv2.pc -%post -n trinity-%{libkexiv}2-devel -/sbin/ldconfig || : - -%postun -n trinity-%{libkexiv}2-devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -161,7 +146,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -201,7 +186,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} - -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-2 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec index 03e4966ac..38f08646a 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkexiv2 %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -28,7 +23,7 @@ Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] Epoch: 1 Version: 0.1.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries @@ -92,7 +87,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -157,9 +152,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_libdir}/pkgconfig/libkexiv2.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec index d6a48a34f..010aafa52 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libkipi (version R14.0.0) +# spec file for package libkipi (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libkipi %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -34,11 +36,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libkipi %{_lib}kipi %else @@ -47,11 +44,11 @@ Name: trinity-%{tde_pkg} -Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] -Group: System/Libraries -Epoch: 2 +Epoch: %{tde_epoch} Version: 0.1.5 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Library for apps that want to use kipi-plugins (runtime version) [Trinity] +Group: System/Libraries URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -76,7 +73,7 @@ BuildRequires: gettext BuildRequires: gcc-c++ # LCMS support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel %else BuildRequires: lcms-devel @@ -96,9 +93,9 @@ BuildRequires: libtool-ltdl-devel %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 +- that contains common routines and widget used by kipi-plugins +- to ease implementation of the kipi-plugins interface in an application + that wants to use kipi-plugins Homepage: http://www.kipi-plugins.org/ @@ -119,20 +116,6 @@ Libkipi is a library Homepage: http://www.kipi-plugins.org/ -%post -n trinity-%{libkipi}0 -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 -n trinity-%{libkipi}0 -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 || : - %files -n trinity-%{libkipi}0 -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_libdir}/libkipi.so.0 @@ -167,12 +150,6 @@ Homepage: http://www.kipi-plugins.org/ %{tde_tdeincludedir}/libkipi/ %{tde_libdir}/pkgconfig/libkipi.pc -%post -n trinity-%{libkipi}-devel -/sbin/ldconfig || : - -%postun -n trinity-%{libkipi}-devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -185,7 +162,7 @@ Homepage: http://www.kipi-plugins.org/ %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -226,6 +203,4 @@ export PATH="%{tde_bindir}:${PATH}" -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-2 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec index 156064992..740aea3b1 100644 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libkipi %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Summary: library for apps that want to use kipi-plugins (runtime version) [Trini Epoch: 1 Version: 0.1.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries @@ -96,7 +91,7 @@ Homepage: http://www.kipi-plugins.org/ %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -169,9 +164,4 @@ done %{tde_tdeincludedir}/libkipi/ %{tde_libdir}/pkgconfig/libkipi.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index 6d7bfb862..9254f1700 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -1,5 +1,9 @@ +%if 0%{?fedora} >= 23 +%define _hardened_ldflags %nil +%endif + # -# spec file for package libksquirrel (version R14.0.0) +# spec file for package libksquirrel (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +16,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +25,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -34,18 +40,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} -Summary: Trinity image viewer -Group: System/Libraries Epoch: %{tde_epoch} Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity image viewer +Group: System/Libraries URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -61,6 +62,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -80,6 +82,10 @@ BuildRequires: libtool-ltdl-devel # TRANSFIG support BuildRequires: transfig +# GHOSTSCRIPT support +%define with_ghostscript 1 +BuildRequires: ghostscript + # GETTEXT support BuildRequires: gettext BuildRequires: gettext-devel @@ -91,10 +97,9 @@ BuildRequires: OpenEXR-devel BuildRequires: libtiff-devel # GIF support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?fedora} >= 28 BuildRequires: giflib-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} +%else BuildRequires: libungif-devel %endif @@ -117,6 +122,9 @@ BuildRequires: xmedcon-devel # RSVG support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_svg 1 +%if 0%{?rhel} == 5 +BuildRequires: librsvg2-devel +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif @@ -159,6 +167,9 @@ BuildRequires: freetype-devel # WMF support BuildRequires: libwmf-devel +# XML2 support +BuildRequires: libxml2-devel + # NETPBM support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} BuildRequires: netpbm @@ -192,8 +203,10 @@ This package contains the runtime libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0 %endif +%if 0%{?with_ghostscript} %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0 %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0 +%endif %{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 @@ -308,12 +321,6 @@ This package contains the runtime libraries for KSquirrel. %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui %{tde_datadir}/ksquirrel-libs/rgbmap -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - ########## %package devel @@ -352,8 +359,10 @@ This package contains the development libraries for KSquirrel. %{tde_libdir}/ksquirrel-libs/libkls_djvu.la %{tde_libdir}/ksquirrel-libs/libkls_djvu.so %endif +%if 0%{?with_ghostscript} %{tde_libdir}/ksquirrel-libs/libkls_eps.la %{tde_libdir}/ksquirrel-libs/libkls_eps.so +%endif %{tde_libdir}/ksquirrel-libs/libkls_fig.la %{tde_libdir}/ksquirrel-libs/libkls_fig.so %{tde_libdir}/ksquirrel-libs/libkls_fli.la @@ -459,12 +468,6 @@ This package contains the development libraries for KSquirrel. %{tde_libdir}/pkgconfig/ksquirrellibs.pc %{tde_docdir}/ksquirrel-libs/ -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %package tools @@ -519,7 +522,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then fi %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -558,6 +561,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8.0-1 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index e1d177c2d..9945da33c 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg libksquirrel %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity image viewer Epoch: 1 Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Environment/Libraries @@ -165,7 +160,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then fi %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -516,9 +511,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/ksquirrel-libs-xim2ppm -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc b/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index 0ea245548..c13dbe2ae 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libtdeldap (version R14.0.0) +# spec file for package libtdeldap (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -34,18 +36,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} -Summary: LDAP interface library for TDE -Group: System/Libraries Epoch: %{tde_epoch} Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: LDAP interface library for TDE +Group: System/Libraries URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -86,22 +83,41 @@ BuildRequires: cyrus-sasl-devel %endif # OPENLDAP support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel %endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif +%if 0%{?rhel} == 5 +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 -%description -LDAP interface library for TDE management modules. +# UDEV support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define with_tdehwlib 1 +BuildRequires: libudev-devel +%endif + +# LIBCOM_ERR support +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 +BuildRequires: libcom_err-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ext2fs-devel +%endif -%post -/sbin/ldconfig || : -%postun -/sbin/ldconfig || : +%description +LDAP interface library for TDE management modules. %files %defattr(-,root,root,-) @@ -120,12 +136,6 @@ LDAP interface library for TDE management modules. libtdeldap-trinity-dev contains development files and documentation. -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - %files devel %defattr(-,root,root,-) %{tde_tdeincludedir}/ldappasswddlg.h @@ -145,7 +155,7 @@ libtdeldap-trinity-dev contains development files and documentation. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -153,6 +163,19 @@ libtdeldap-trinity-dev contains development files and documentation. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +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}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -167,7 +190,10 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} @@ -182,6 +208,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 20.5-1 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec index 4d9b213a0..ab21298c0 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec @@ -1,77 +1,103 @@ -# Default version for this component -%define tde_pkg libtqt-perl +# +# spec file for package libtqt-perl (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg libtqt-perl +%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_appdir %{tde_datadsir}/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: Perl bindings for the TQt library +Epoch: %{tde_epoch} Version: 3.008 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Perl bindings for the TQt library +Group: Development/Libraries/Perl +URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else License: GPLv2+ -Group: Environment/Libraries +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: automake autoconf libtool +BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -BuildRequires: gettext +BuildRequires: pkgconfig BuildRequires: trinity-libsmoketqt-devel >= %{tde_version} -Provides: perl(TQtShell) -Provides: perl(TQtShellControl) +BuildRequires: perl(ExtUtils::MakeMaker) + +Requires: perl-TQt = %{?epoch:%{epoch}:}%{version}-%{release} %description This module lets you use the TQt library from Perl. It provides an object-oriented interface and is easy to use. - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - %files %defattr(-,root,root,-) %{tde_bindir}/puic %{tde_mandir}/man1/puic.1* %{_bindir}/pqtapi %{_bindir}/pqtsh +%if 0%{?rhel} == 5 +%{_datadir}/doc/libqt-perl/ +%endif + +########## + +%package -n perl-TQt +Summary: Perl bindings for the TQt library +Group: Development/Libraries/Perl + +Provides: perl(TQtShell) +Provides: perl(TQtShellControl) + +%description -n perl-TQt +This module lets you use the TQt library from Perl. +It provides an object-oriented interface and is easy to use. + +%files -n perl-TQt +%defattr(-,root,root,-) %{perl_vendorarch}/TQt.pm %{perl_vendorarch}/TQt.pod +%dir %{perl_vendorarch}/TQt %{perl_vendorarch}/TQt/GlobalSpace.pm %{perl_vendorarch}/TQt/attributes.pm %{perl_vendorarch}/TQt/constants.pm @@ -86,7 +112,7 @@ It provides an object-oriented interface and is easy to use. ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -96,14 +122,14 @@ It provides an object-oriented interface and is easy to use. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 TDEDIR=%{tde_prefix} export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -120,7 +146,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --disable-smoke + +# Fix invalid path in RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "PerlTQt/Makefile" -e "s|\$(PREFIX)/|\$(DESTDIR)\$(PREFIX)/|" +%endif %__make %{?_smp_mflags} @@ -130,13 +163,13 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Unwanted files %__rm -f %{buildroot}%{perl_archlib}/perllocal.pod +%__rm -f %{buildroot}%{perl_vendorarch}/auto/TQt/.packlist %clean %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.008-1 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index 581d142cd..88888da02 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -1,51 +1,68 @@ +# +# spec file for package pytdeextensions (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/ +# + %{!?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 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables +%define tde_pkg pytdeextensions +%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_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] +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 0.4.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Python packages to support TDE applications (scripts) +Group: Development/Libraries/Python +URL: http://www.trinitydesktop.org/ +#URL: http://www.simonzone.com/software/pykdeextensions + +%if 0%{?suse_version} +License: GPL-2.0+ +%else License: GPLv2+ -Group: Applications/Utilities +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/pykdeextensions +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: desktop-file-utils BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ BuildRequires: python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1 BuildRequires: trinity-python-trinity-devel @@ -53,15 +70,15 @@ BuildRequires: trinity-pytqt-tools Requires: python-tqt Requires: trinity-python-trinity -Requires: trinity-libpythonize0 = %{version}-%{release} +Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} # SIP BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 -Obsoletes: trinity-pykdeextensions < %{version}-%{release} -Provides: trinity-pykdeextensions = %{version}-%{release} +Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -79,45 +96,36 @@ to support the creation and installation of TDE applications. ########## %package -n trinity-libpythonize0 -Summary: Python packages to support KDE applications (library) [Trinity] -Group: Environment/Libraries +Summary: Python packages to support TDE applications (library) +Group: Development/Libraries/Python %description -n trinity-libpythonize0 PyTDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. +to support the creation and installation of TDE 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} +%package -n trinity-libpythonize-devel +Summary: Python packages to support TDE applications (development) +Group: Development/Libraries/Python +Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-libpythonize0-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libpythonize0-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n trinity-libpythonize0-devel +%description -n trinity-libpythonize-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 +%files -n trinity-libpythonize-devel %defattr(-,root,root,-) %{tde_tdeincludedir}/*.h %{tde_libdir}/libpythonize.la @@ -126,19 +134,20 @@ This package contains the libpythonize development files. ########## %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} +Summary: Meta-package to install all pytdeextensions development files +Group: Development/Libraries/Python +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libpythonize-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel -%{summary} +This package is a meta-package to install all pytdeextensions development +files. %files devel ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -171,6 +180,11 @@ if [ -f "%{_libdir}/${LIBPYTHON}" ]; then -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|" fi +# Fix FTBFS on RHEL 5 +%if 0%{?rhel} == 5 +%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" +%endif + %build unset QTDIR QTINC QTLIB @@ -223,5 +237,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-6 -- Initial build for TDE 14.0.0 diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec index a9b5fffd9..069af8cec 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec @@ -2,11 +2,6 @@ %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" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-pytdeextensions Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -228,11 +223,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index 4b19fb540..f969038f9 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -1,53 +1,68 @@ +# +# spec file for package python-trinity (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/ +# + %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# TDE specific building variables +%endif +%define tde_pkg python-trinity +%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_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] +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 3.16.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Trinity bindings for Python +Group: Development/Libraries/Python +URL: http://www.trinitydesktop.org/ +#URL: http://www.simonzone.com/software/pykdeextensions +%if 0%{?suse_version} +License: GPL-2.0+ +%else License: GPLv2+ -Group: Applications/Utilities +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -#URL: http://www.simonzone.com/software/pykdeextensions -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} +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: desktop-file-utils BuildRequires: gettext +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ # PYTHON support BuildRequires: python @@ -58,19 +73,27 @@ Requires: python-tqt BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 -Obsoletes: python-trinity < %{version}-%{release} -Provides: python-trinity = %{version}-%{release} +Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity = %{?epoch:%{epoch}:}%{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 tdeio, tdejs, tdehtml and tdeprint. +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{python_sitearch}/*.so +%{python_sitearch}/dcop*.py* +%{python_sitearch}/pytde*.py* + +########## %package devel -Summary: Trinity bindings for Python - Development files and scripts [Trinity] -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Trinity bindings for Python - Development files and scripts +Group: Development/Libraries/Python +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: python-trinity-devel < %{version}-%{release} Provides: python-trinity-devel = %{version}-%{release} @@ -82,23 +105,36 @@ packages based on them. The package also contains kdepyuic, a wrapper script around PyQt's user interface compiler. +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/tdepyuic +# The SIP files are outside TDE's prefix +%{_datadir}/sip/trinity/ + +########## %package doc -Summary: Documentation and examples for PyTDE [Trinity] -Group: Development/Libraries +Summary: Documentation and examples for PyTDE +Group: Development/Libraries/Python -Obsoletes: python-trinity-doc < %{version}-%{release} -Provides: python-trinity-doc = %{version}-%{release} +Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} %description doc General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. +%files doc +%defattr(-,root,root,-) +%{tde_tdedocdir}/HTML/en/python-trinity/ + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -133,24 +169,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{python_sitearch}/*.so -%{python_sitearch}/dcop*.py* -%{python_sitearch}/pytde*.py* - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/tdepyuic -# The SIP files are outside TDE's prefix -%{_datadir}/sip/trinity/ - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/en/python-trinity/ - - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.16.3-5 -- Initial release for TDE 14.0.0 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 index ee6f31361..279346a1f 100644 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec @@ -1,9 +1,5 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif %define tde_version 3.5.13.2 # TDE specific building variables @@ -28,7 +24,7 @@ Name: trinity-python-trinity Summary: Trinity bindings for Python [Trinity] Version: 3.16.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -188,11 +184,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.6.13-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.16.3-4 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec index 47129a3c7..bad847a91 100644 --- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec +++ b/redhat/main/tde-i18n/tde-i18n-14.0.0.spec @@ -1,43 +1,62 @@ -# Default version for this component -%define tde_pkg tde-i18n +# +# spec file for package tde-i18n (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables -BuildRequires: autoconf automake libtool m4 +%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/tde %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 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 +%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} -Summary: Internationalization support for Trinity Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +Release: %{?!preversion:1}%{?preversion:0_%{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) - -# 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 @@ -47,636 +66,1353 @@ AutoReq: no Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: findutils BuildRequires: gettext +BuildRequires: cmake +BuildRequires: gcc-c++ %description -%{summary}. +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} +Provides: %{name}-af = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release} +Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} + %description Afrikaans -%{summary}. +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} +Provides: %{name}-ar = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{version}-%{release} + %description Arabic -%{summary}. +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} +Provides: %{name}-az = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{version}-%{release} + %description Azerbaijani -%{summary}. +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} +Provides: %{name}-be = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release} +Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} + %description Belarusian -%{summary}. +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} +Provides: %{name}-bg = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release} +Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} + %description Bulgarian -%{summary}. +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} +Provides: %{name}-bn = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release} +Provides: trinity-kde-i18n-Bengali = %{version}-%{release} + %description Bengali -%{summary}. +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} +Provides: %{name}-bo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release} +Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} + %description Tibetan -%{summary}. +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} +Provides: %{name}-br = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release} +Provides: trinity-kde-i18n-Breton = %{version}-%{release} + %description Breton -%{summary}. +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} +Provides: %{name}-bs = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release} +Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} + %description Bosnian -%{summary}. +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} +Provides: %{name}-ca = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release} +Provides: trinity-kde-i18n-Catalan = %{version}-%{release} + %description Catalan -%{summary}. +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} +Provides: %{name}-cs = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release} +Provides: trinity-kde-i18n-Czech = %{version}-%{release} + %description Czech -%{summary}. +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} +Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release} +Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release} + %description Cymraeg -%{summary}. +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} +Provides: %{name}-cy = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release} +Provides: trinity-kde-i18n-Welsh = %{version}-%{release} + %description Welsh -%{summary}. +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} +Provides: %{name}-da = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release} +Provides: trinity-kde-i18n-Danish = %{version}-%{release} + %description Danish -%{summary}. +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} +Provides: %{name}-de = %{version}-%{release} +Obsoletes: trinity-kde-i18n-German < %{version}-%{release} +Provides: trinity-kde-i18n-German = %{version}-%{release} + %description German -%{summary}. +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} +Provides: %{name}-el = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release} +Provides: trinity-kde-i18n-Greek = %{version}-%{release} + %description Greek -%{summary}. +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} +Provides: %{name}-en_GB = %{version}-%{release} +Obsoletes: trinity-kde-i18n-British < %{version}-%{release} +Provides: trinity-kde-i18n-British = %{version}-%{release} + %description British -%{summary}. +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} +Provides: %{name}-eo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release} +Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} + %description Esperanto -%{summary}. +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} +Provides: %{name}-es = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release} +Provides: trinity-kde-i18n-Spanish = %{version}-%{release} + %description Spanish -%{summary}. +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} +Provides: %{name}-et = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release} +Provides: trinity-kde-i18n-Estonian = %{version}-%{release} + %description Estonian -%{summary}. +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} +Provides: %{name}-eu = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release} +Provides: trinity-kde-i18n-Basque = %{version}-%{release} + %description Basque -%{summary}. +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} +Provides: %{name}-fa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release} +Provides: trinity-kde-i18n-Farsi = %{version}-%{release} + %description Farsi -%{summary}. +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} +Provides: %{name}-fi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release} +Provides: trinity-kde-i18n-Finnish = %{version}-%{release} + %description Finnish -%{summary}. +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} +Provides: %{name}-fo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release} +Provides: trinity-kde-i18n-Faroese = %{version}-%{release} + %description Faroese -%{summary}. +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} +Provides: %{name}-fr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-French < %{version}-%{release} +Provides: trinity-kde-i18n-French = %{version}-%{release} + %description French -%{summary}. +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} +Provides: %{name}-fy = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release} +Provides: trinity-kde-i18n-Frisian = %{version}-%{release} + %description Frisian -%{summary}. +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} +Provides: %{name}-ga = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release} +Provides: trinity-kde-i18n-Irish = %{version}-%{release} + %description Irish -%{summary}. +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} +Provides: %{name}-gl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release} +Provides: trinity-kde-i18n-Galician = %{version}-%{release} + %description Galician -%{summary}. +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} +Provides: %{name}-he = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release} +Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} + %description Hebrew -%{summary}. +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} +Provides: %{name}-hi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release} +Provides: trinity-kde-i18n-Hindi = %{version}-%{release} + %description Hindi -%{summary}. +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} +Provides: %{name}-hr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release} +Provides: trinity-kde-i18n-Croatian = %{version}-%{release} + %description Croatian -%{summary}. +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} +Provides: %{name}-hu = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release} +Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} + %description Hungarian -%{summary}. +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} +Provides: %{name}-id = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release} +Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} + %description Indonesian -%{summary}. +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} +Provides: %{name}-is = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release} +Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} + %description Icelandic -%{summary}. +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} +Provides: %{name}-it = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release} +Provides: trinity-kde-i18n-Italian = %{version}-%{release} + %description Italian -%{summary}. +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} +Provides: %{name}-ja = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release} +Provides: trinity-kde-i18n-Japanese = %{version}-%{release} + %description Japanese -%{summary}. +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} +Provides: %{name}-ko = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release} +Provides: trinity-kde-i18n-Korean = %{version}-%{release} + %description Korean -%{summary}. +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} +Provides: %{name}-ku = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release} +Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} + %description Kurdish -%{summary}. +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} +Provides: %{name}-lo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release} +Provides: trinity-kde-i18n-Lao = %{version}-%{release} + %description Lao -%{summary}. +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} +Provides: %{name}-lt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release} +Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} + %description Lithuanian -%{summary}. +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} +Provides: %{name}-lv = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release} +Provides: trinity-kde-i18n-Latvian = %{version}-%{release} + %description Latvian -%{summary}. +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} +Provides: %{name}-mi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release} +Provides: trinity-kde-i18n-Maori = %{version}-%{release} + %description Maori -%{summary}. +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} +Provides: %{name}-mk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release} +Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} + %description Macedonian -%{summary}. +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} +Provides: %{name}-mt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release} +Provides: trinity-kde-i18n-Maltese = %{version}-%{release} + %description Maltese -%{summary}. +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} +Provides: %{name}-nl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release} +Provides: trinity-kde-i18n-Dutch = %{version}-%{release} + %description Dutch -%{summary}. +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} +Provides: %{name}-no = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release} +Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} + %description Norwegian -%{summary}. +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} +Provides: %{name}-nn = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release} +Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} + %description Norwegian-Nynorsk -%{summary}. +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} +Provides: %{name}-oc = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release} +Provides: trinity-kde-i18n-Occitan = %{version}-%{release} + %description Occitan -%{summary}. +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} +Provides: %{name}-pl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release} +Provides: trinity-kde-i18n-Polish = %{version}-%{release} + %description Polish -%{summary}. +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} +Provides: %{name}-pt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release} +Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} + %description Portuguese -%{summary}. +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} +Provides: %{name}-pa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release} +Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} + %description Punjabi -%{summary}. +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} +Provides: %{name}-pt_BR = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release} +Provides: trinity-kde-i18n-Brazil = %{version}-%{release} + %description Brazil -%{summary}. +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} +Provides: %{name}-ro = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release} +Provides: trinity-kde-i18n-Romanian = %{version}-%{release} + %description Romanian -%{summary}. +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} +Provides: %{name}-ru = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release} +Provides: trinity-kde-i18n-Russian = %{version}-%{release} + %description Russian -%{summary}. +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} +Provides: %{name}-sk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release} +Provides: trinity-kde-i18n-Slovak = %{version}-%{release} + %description Slovak -%{summary}. +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} +Provides: %{name}-sl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release} +Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} + %description Slovenian -%{summary}. +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} +Provides: %{name}-sr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release} +Provides: trinity-kde-i18n-Serbian = %{version}-%{release} + %description Serbian -%{summary}. +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} +Provides: %{name}-sv = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release} +Provides: trinity-kde-i18n-Swedish = %{version}-%{release} + %description Swedish -%{summary}. +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} +Provides: %{name}-ta = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release} +Provides: trinity-kde-i18n-Tamil = %{version}-%{release} + %description Tamil -%{summary}. +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} +Provides: %{name}-tg = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release} +Provides: trinity-kde-i18n-Tajik = %{version}-%{release} + %description Tajik -%{summary}. +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} +Provides: %{name}-th = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release} +Provides: trinity-kde-i18n-Thai = %{version}-%{release} + %description Thai -%{summary}. +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} +Provides: %{name}-tr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release} +Provides: trinity-kde-i18n-Turkish = %{version}-%{release} + %description Turkish -%{summary}. +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} +Provides: %{name}-uk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release} +Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} + %description Ukrainian -%{summary}. +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} +Provides: %{name}-ven = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release} +Provides: trinity-kde-i18n-Venda = %{version}-%{release} + %description Venda -%{summary}. +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} +Provides: %{name}-vi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release} +Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} + %description Vietnamese -%{summary}. +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} +Provides: %{name}-wa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release} +Provides: trinity-kde-i18n-Walloon = %{version}-%{release} + %description Walloon -%{summary}. +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} +Provides: %{name}-xh = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release} +Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} + %description Xhosa -%{summary}. +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} +Provides: %{name}-zh_CN = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release} +Provides: trinity-kde-i18n-Chinese = %{version}-%{release} + %description Chinese -%{summary}. +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} +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 -%{summary}. +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}} @@ -754,450 +1490,5 @@ 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/* -%{tde_tdedocdir}/HTML/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/ -%endif - -%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%{tde_datadir}/locale/cs/* -%{tde_tdedocdir}/HTML/cs/ -%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/ -%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/ -%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/* -%{tde_tdedocdir}/HTML/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/ -%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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/hr/ -%endif - -%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hu/* -%{tde_tdedocdir}/HTML/hu/ -%endif - -%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%{tde_datadir}/locale/id/* -%{tde_tdedocdir}/HTML/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/ -%endif - -%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%{tde_datadir}/locale/ja/* -%{tde_tdedocdir}/HTML/ja/ -%endif - -%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%{tde_datadir}/locale/ko/* -%{tde_tdedocdir}/HTML/ko/ -%endif - -%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ku/* -%{tde_tdedocdir}/HTML/ku/ -%endif - -%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%{tde_datadir}/locale/lo/* -%{tde_tdedocdir}/HTML/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 mt <<< '%{TDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%{tde_datadir}/locale/mt/* -%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/* -#%{tde_tdedocdir}/HTML/nb/ -%endif - -%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%{tde_datadir}/locale/nn/* -#%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/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/ -%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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/tr/ -%endif - -%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/uk/ -%{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/* -%{tde_tdedocdir}/HTML/xh/ -%endif - -%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_CN/* -%{tde_tdedocdir}/HTML/zh_CN/ -%endif - -%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_TW/* -%{tde_tdedocdir}/HTML/zh_TW/ -%endif %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 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 index 444ed210b..2d7946091 100644 --- a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec +++ b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec @@ -1,44 +1,63 @@ -# Default version for this component -%define tde_pkg tde-i18n +# +# 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 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt %endif - -# TDE specific building variables -BuildRequires: autoconf automake libtool m4 +%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 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 +%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} -Summary: Internationalization support for Trinity Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +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) - -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch +BuildArch: noarch # Speed build options %define debug_package %{nil} @@ -47,649 +66,1365 @@ AutoReq: no Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +BuildRequires: trinity-tdelibs-devel >= %{tde_version} + BuildRequires: findutils BuildRequires: gettext -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: gcc-c++ %description -%{summary}. +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} +Provides: %{name}-af = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release} +Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} + %description Afrikaans -%{summary}. +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} +Provides: %{name}-ar = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{version}-%{release} + %description Arabic -%{summary}. +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} +Provides: %{name}-az = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{version}-%{release} + %description Azerbaijani -%{summary}. +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} +Provides: %{name}-be = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release} +Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} + %description Belarusian -%{summary}. +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} +Provides: %{name}-bg = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release} +Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} + %description Bulgarian -%{summary}. +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} +Provides: %{name}-bn = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release} +Provides: trinity-kde-i18n-Bengali = %{version}-%{release} + %description Bengali -%{summary}. +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} +Provides: %{name}-bo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release} +Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} + %description Tibetan -%{summary}. +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} +Provides: %{name}-br = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release} +Provides: trinity-kde-i18n-Breton = %{version}-%{release} + %description Breton -%{summary}. +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} +Provides: %{name}-bs = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release} +Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} + %description Bosnian -%{summary}. +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} +Provides: %{name}-ca = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release} +Provides: trinity-kde-i18n-Catalan = %{version}-%{release} + %description Catalan -%{summary}. +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} +Provides: %{name}-cs = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release} +Provides: trinity-kde-i18n-Czech = %{version}-%{release} + %description Czech -%{summary}. +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} +Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release} +Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release} + %description Cymraeg -%{summary}. +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} +Provides: %{name}-cy = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release} +Provides: trinity-kde-i18n-Welsh = %{version}-%{release} + %description Welsh -%{summary}. +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} +Provides: %{name}-da = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release} +Provides: trinity-kde-i18n-Danish = %{version}-%{release} + %description Danish -%{summary}. +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} +Provides: %{name}-de = %{version}-%{release} +Obsoletes: trinity-kde-i18n-German < %{version}-%{release} +Provides: trinity-kde-i18n-German = %{version}-%{release} + %description German -%{summary}. +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} +Provides: %{name}-el = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release} +Provides: trinity-kde-i18n-Greek = %{version}-%{release} + %description Greek -%{summary}. +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} +Provides: %{name}-en_GB = %{version}-%{release} +Obsoletes: trinity-kde-i18n-British < %{version}-%{release} +Provides: trinity-kde-i18n-British = %{version}-%{release} + %description British -%{summary}. +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} +Provides: %{name}-eo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release} +Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} + %description Esperanto -%{summary}. +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} +Provides: %{name}-es = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release} +Provides: trinity-kde-i18n-Spanish = %{version}-%{release} + %description Spanish -%{summary}. +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} +Provides: %{name}-et = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release} +Provides: trinity-kde-i18n-Estonian = %{version}-%{release} + %description Estonian -%{summary}. +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} +Provides: %{name}-eu = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release} +Provides: trinity-kde-i18n-Basque = %{version}-%{release} + %description Basque -%{summary}. +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} +Provides: %{name}-fa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release} +Provides: trinity-kde-i18n-Farsi = %{version}-%{release} + %description Farsi -%{summary}. +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} +Provides: %{name}-fi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release} +Provides: trinity-kde-i18n-Finnish = %{version}-%{release} + %description Finnish -%{summary}. +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} +Provides: %{name}-fo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release} +Provides: trinity-kde-i18n-Faroese = %{version}-%{release} + %description Faroese -%{summary}. +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} +Provides: %{name}-fr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-French < %{version}-%{release} +Provides: trinity-kde-i18n-French = %{version}-%{release} + %description French -%{summary}. +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} +Provides: %{name}-fy = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release} +Provides: trinity-kde-i18n-Frisian = %{version}-%{release} + %description Frisian -%{summary}. +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} +Provides: %{name}-ga = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release} +Provides: trinity-kde-i18n-Irish = %{version}-%{release} + %description Irish -%{summary}. +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} +Provides: %{name}-gl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release} +Provides: trinity-kde-i18n-Galician = %{version}-%{release} + %description Galician -%{summary}. +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} +Provides: %{name}-he = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release} +Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} + %description Hebrew -%{summary}. +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} +Provides: %{name}-hi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release} +Provides: trinity-kde-i18n-Hindi = %{version}-%{release} + %description Hindi -%{summary}. +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} +Provides: %{name}-hr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release} +Provides: trinity-kde-i18n-Croatian = %{version}-%{release} + %description Croatian -%{summary}. +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} +Provides: %{name}-hu = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release} +Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} + %description Hungarian -%{summary}. +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} +Provides: %{name}-id = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release} +Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} + %description Indonesian -%{summary}. +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} +Provides: %{name}-is = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release} +Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} + %description Icelandic -%{summary}. +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} +Provides: %{name}-it = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release} +Provides: trinity-kde-i18n-Italian = %{version}-%{release} + %description Italian -%{summary}. +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} +Provides: %{name}-ja = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release} +Provides: trinity-kde-i18n-Japanese = %{version}-%{release} + %description Japanese -%{summary}. +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} +Provides: %{name}-ko = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release} +Provides: trinity-kde-i18n-Korean = %{version}-%{release} + %description Korean -%{summary}. +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} +Provides: %{name}-ku = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release} +Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} + %description Kurdish -%{summary}. +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} +Provides: %{name}-lo = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release} +Provides: trinity-kde-i18n-Lao = %{version}-%{release} + %description Lao -%{summary}. +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} +Provides: %{name}-lt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release} +Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} + %description Lithuanian -%{summary}. +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} +Provides: %{name}-lv = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release} +Provides: trinity-kde-i18n-Latvian = %{version}-%{release} + %description Latvian -%{summary}. +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} +Provides: %{name}-mi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release} +Provides: trinity-kde-i18n-Maori = %{version}-%{release} + %description Maori -%{summary}. +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} +Provides: %{name}-mk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release} +Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} + %description Macedonian -%{summary}. +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} +Provides: %{name}-mt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release} +Provides: trinity-kde-i18n-Maltese = %{version}-%{release} + %description Maltese -%{summary}. +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} +Provides: %{name}-nl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release} +Provides: trinity-kde-i18n-Dutch = %{version}-%{release} + %description Dutch -%{summary}. +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} +Provides: %{name}-no = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release} +Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} + %description Norwegian -%{summary}. +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} +Provides: %{name}-nn = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release} +Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} + %description Norwegian-Nynorsk -%{summary}. +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} +Provides: %{name}-oc = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release} +Provides: trinity-kde-i18n-Occitan = %{version}-%{release} + %description Occitan -%{summary}. +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} +Provides: %{name}-pl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release} +Provides: trinity-kde-i18n-Polish = %{version}-%{release} + %description Polish -%{summary}. +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} +Provides: %{name}-pt = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release} +Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} + %description Portuguese -%{summary}. +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} +Provides: %{name}-pa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release} +Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} + %description Punjabi -%{summary}. +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} +Provides: %{name}-pt_BR = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release} +Provides: trinity-kde-i18n-Brazil = %{version}-%{release} + %description Brazil -%{summary}. +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} +Provides: %{name}-ro = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release} +Provides: trinity-kde-i18n-Romanian = %{version}-%{release} + %description Romanian -%{summary}. +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} +Provides: %{name}-ru = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release} +Provides: trinity-kde-i18n-Russian = %{version}-%{release} + %description Russian -%{summary}. +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} +Provides: %{name}-sk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release} +Provides: trinity-kde-i18n-Slovak = %{version}-%{release} + %description Slovak -%{summary}. +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} +Provides: %{name}-sl = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release} +Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} + %description Slovenian -%{summary}. +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} +Provides: %{name}-sr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release} +Provides: trinity-kde-i18n-Serbian = %{version}-%{release} + %description Serbian -%{summary}. +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} +Provides: %{name}-sv = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release} +Provides: trinity-kde-i18n-Swedish = %{version}-%{release} + %description Swedish -%{summary}. +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} +Provides: %{name}-ta = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release} +Provides: trinity-kde-i18n-Tamil = %{version}-%{release} + %description Tamil -%{summary}. +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} +Provides: %{name}-tg = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release} +Provides: trinity-kde-i18n-Tajik = %{version}-%{release} + %description Tajik -%{summary}. +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} +Provides: %{name}-th = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release} +Provides: trinity-kde-i18n-Thai = %{version}-%{release} + %description Thai -%{summary}. +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} +Provides: %{name}-tr = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release} +Provides: trinity-kde-i18n-Turkish = %{version}-%{release} + %description Turkish -%{summary}. +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} +Provides: %{name}-uk = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release} +Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} + %description Ukrainian -%{summary}. +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} +Provides: %{name}-ven = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release} +Provides: trinity-kde-i18n-Venda = %{version}-%{release} + %description Venda -%{summary}. +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} +Provides: %{name}-vi = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release} +Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} + %description Vietnamese -%{summary}. +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} +Provides: %{name}-wa = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release} +Provides: trinity-kde-i18n-Walloon = %{version}-%{release} + %description Walloon -%{summary}. +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} +Provides: %{name}-xh = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release} +Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} + %description Xhosa -%{summary}. +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} +Provides: %{name}-zh_CN = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release} +Provides: trinity-kde-i18n-Chinese = %{version}-%{release} + %description Chinese -%{summary}. +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} +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 -%{summary}. +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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 -. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" +. /etc/profile.d/qt3.sh export KDEDIR=%{tde_prefix} - export kde_htmldir="%{tde_tdedocdir}/HTML" ( @@ -721,6 +1456,7 @@ fi wait rm -f /tmp/rpmbuild.$$ + %install %__rm -rf %{?buildroot} export PATH="%{tde_bindir}:${PATH}" @@ -733,38 +1469,6 @@ for l in %{TDE_LANGS}; do done done -# make symlinks relative -%if "%{tde_prefix}" == "/usr" -pushd "%{buildroot}%{tde_tdedocdir}/HTML" -for lang in *; do - if [ -d "$lang" ]; then - pushd "$lang" - for i in */*/*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../../docs/common $i - fi - done - - for i in */*; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../../docs/common $i - fi - done - - for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -sf ../docs/common $i - fi - done - - popd - fi -done -popd -%endif # remove zero-length file find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; @@ -780,486 +1484,9 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; # remove obsolete KDE 3 application data translations %__rm -rf "%{buildroot}%{tde_datadir}/apps" + %clean %__rm -rf %{buildroot} -%if "%( grep -w af <<< '%{TDE_LANGS}' )" != "" -%files Afrikaans -%defattr(-,root,root,-) -%{tde_datadir}/locale/af/* -%{tde_tdedocdir}/HTML/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/ -%endif - -%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%{tde_datadir}/locale/cs/* -%{tde_tdedocdir}/HTML/cs/ -%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/ -%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/ -%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/* -%{tde_tdedocdir}/HTML/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/ -%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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/hr/ -%endif - -%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hu/* -%{tde_tdedocdir}/HTML/hu/ -%endif - -%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%{tde_datadir}/locale/id/* -%{tde_tdedocdir}/HTML/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/ -%endif - -%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%{tde_datadir}/locale/ja/* -%{tde_tdedocdir}/HTML/ja/ -%endif - -%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%{tde_datadir}/locale/ko/* -%{tde_tdedocdir}/HTML/ko/ -%endif - -%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ku/* -%{tde_tdedocdir}/HTML/ku/ -%endif - -%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%{tde_datadir}/locale/lo/* -%{tde_tdedocdir}/HTML/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 mt <<< '%{TDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%{tde_datadir}/locale/mt/* -%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/* -#%{tde_tdedocdir}/HTML/nb/ -%endif - -%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%{tde_datadir}/locale/nn/* -#%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/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/ -%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/* -%{tde_tdedocdir}/HTML/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/* -%{tde_tdedocdir}/HTML/tr/ -%endif - -%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/uk/ -%{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/* -%{tde_tdedocdir}/HTML/xh/ -%endif - -%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_CN/* -%{tde_tdedocdir}/HTML/zh_CN/ -%endif - -%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_TW/* -%{tde_tdedocdir}/HTML/zh_TW/ -%endif %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 - -* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7 -- Renames to 'trinity-i18n' -- Updates 'zh_TW' translations - -* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 -- Updates French translations (mostly Kickoff Menu related) - -* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Removes 'kde-filesystem" dependancy - -* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Fix HTML directory location - -* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Re-adds missing files 'entry.desktop' -- Updates zh_TW translation, thanks to Wei-Lun Chao - -* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Add missing french translations for TDE 3.5.13 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - -* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial version (French language only) -- Based on RHEL SPEC file 'kde-i18n' diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec index e77a423c1..3e8d02cf6 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeaccessibility (version R14.0.0) +# spec file for package tdeaccessibility (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-tdeaccessibility Summary: Trinity Desktop Environment - Accessibility Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -60,6 +58,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -85,14 +84,21 @@ BuildRequires: brp-check-trinity BuildRequires: audiofile-devel # AKODE support -%if 0%{?with_akode} +%define with_akode 1 BuildRequires: trinity-akode-devel -%{?with_mad:BuildRequires: trinity-akode-libmad} + +# MAD support +%ifarch %{ix86} x86_64 +%define with_libmad 1 +%{?with_libmad:BuildRequires: libakode_mpeg_decoder} %endif # ALSA support BuildRequires: alsa-lib-devel +# GLIB2 support +BuildRequires: glib2-devel + # XCB support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} BuildRequires: libxcb-devel @@ -207,20 +213,6 @@ This package is part of Trinity, as a component of the TDE accessibility module. %{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 @@ -242,18 +234,6 @@ This package is part of Trinity, as a component of the TDE accessibility module. %{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 @@ -270,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_datadir}/config/kmouthrc +%{tde_confdir}/kmouthrc %{tde_bindir}/kmouth %{tde_tdeappdir}/kmouth.desktop %{tde_datadir}/apps/kmouth/ @@ -281,18 +261,6 @@ This package is part of Trinity, as a component of the TDE accessibility module. %{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 @@ -319,22 +287,6 @@ This package is part of Trinity, as a component of the TDE accessibility module. %{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop %{tde_tdedocdir}/HTML/en/ksayit/ -%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 @@ -417,22 +369,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{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 @@ -484,12 +420,6 @@ programs. %{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 @@ -505,7 +435,7 @@ programs. %__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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -513,6 +443,7 @@ programs. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export kde_confdir="%{tde_confdir}" %configure \ --prefix=%{tde_prefix} \ @@ -541,15 +472,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# 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 - -# 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/" @@ -558,6 +480,10 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i 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 @@ -577,5 +503,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec index 3f28a0b96..37aa24acf 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec @@ -1,56 +1,93 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} - -Summary: Trinity Desktop Environment - Accessibility Name: trinity-tdeaccessibility +Summary: Trinity Desktop Environment - Accessibility Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2 -Group: User Interface/Desktops - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} +Group: System/GUI/Other URL: http://www.trinitydesktop.org/ -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +%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) -BuildRequires: autoconf automake libtool m4 -BuildRequires: desktop-file-utils -BuildRequires: trinity-akode-devel -BuildRequires: trinity-arts-devel >= 1:1.5.10 +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: alsa-lib-devel +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 -# X11 Libraries -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libXtst-devel +%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 @@ -61,35 +98,24 @@ BuildRequires: %{_lib}xcb-devel %endif %endif -# X11 stuff +# XAU support %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel %if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xext-devel -BuildRequires: %{_lib}x11-devel BuildRequires: %{_lib}xau-devel %else -BuildRequires: %{_lib}xext%{?mgaversion:6}-devel -BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel BuildRequires: %{_lib}xau%{?mgaversion:6}-devel %endif %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel BuildRequires: libXau-devel %endif -%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-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-kde-icons-mono = %{version}-%{release} +Requires: trinity-tde-icons-mono = %{version}-%{release} Requires: trinity-kbstate = %{version}-%{release} Requires: trinity-kmag = %{version}-%{release} Requires: trinity-kmousetool = %{version}-%{release} @@ -111,7 +137,7 @@ Included with this package are: %package -n trinity-tde-icons-mono Summary: A monochromatic icons theme for TDE -Group: User Interface/Desktops +Group: System/GUI/Other Obsoletes: trinity-kde-icons-mono < %{version}-%{release} Provides: trinity-kde-icons-mono = %{version}-%{release} @@ -123,14 +149,21 @@ 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: User Interface/Desktops +Summary: A keyboard status applet for TDE +Group: System/GUI/Other %description -n trinity-kbstate A panel applet that displays the keyboard status. @@ -148,7 +181,7 @@ This package is part of Trinity, as a component of the TDE accessibility module. %package -n trinity-kmag Summary: A screen magnifier for TDE -Group: User Interface/Desktops +Group: System/GUI/Other %description -n trinity-kmag TDE's screen magnifier tool. @@ -163,7 +196,7 @@ 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_datadir}/applnk/Applications/kmag.desktop +%{tde_tdeappdir}/kmag.desktop %{tde_datadir}/apps/kmag/ %{tde_datadir}/icons/hicolor/*/apps/kmag.png %{tde_datadir}/icons/locolor/*/apps/kmag.png @@ -187,7 +220,7 @@ done %package -n trinity-kmousetool Summary: TDE mouse manipulation tool for the disabled -Group: User Interface/Desktops +Group: System/GUI/Other %description -n trinity-kmousetool KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was @@ -199,7 +232,7 @@ 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_datadir}/applnk/Applications/kmousetool.desktop +%{tde_tdeappdir}/kmousetool.desktop %{tde_datadir}/apps/kmousetool/ %{tde_datadir}/icons/hicolor/*/apps/kmousetool.png %{tde_tdedocdir}/HTML/en/kmousetool/ @@ -220,7 +253,7 @@ done %package -n trinity-kmouth Summary: A type-and-say KDE frontend for speech synthesizers -Group: User Interface/Desktops +Group: System/GUI/Other %description -n trinity-kmouth KDE's type-and-say frontend for speech synthesizers. @@ -234,7 +267,7 @@ This package is part of Trinity, as a component of the TDE accessibility module. %defattr(-,root,root,-) %{tde_datadir}/config/kmouthrc %{tde_bindir}/kmouth -%{tde_datadir}/applnk/Applications/kmouth.desktop +%{tde_tdeappdir}/kmouth.desktop %{tde_datadir}/apps/kmouth/ %{tde_datadir}/icons/hicolor/*/actions/speak.png %{tde_datadir}/icons/hicolor/*/actions/nospeak.png @@ -259,7 +292,7 @@ done %package -n trinity-ksayit Summary: A frontend for the TDE Text-to-Speech system -Group: User Interface/Desktops +Group: System/GUI/Other %description -n trinity-ksayit Text-to-speech front-end to kttsd. @@ -269,7 +302,6 @@ 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_tdeincludedir}/ksayit_fxplugin.h %{tde_tdelibdir}/libFreeverb_plugin.la %{tde_tdelibdir}/libFreeverb_plugin.so %{tde_libdir}/libKTTSD_Lib.so.* @@ -301,7 +333,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kttsd Summary: A Text-to-Speech system for TDE -Group: User Interface/Desktops +Group: System/GUI/Other %description -n trinity-kttsd The KDE Text-to-Speech system is a plugin based service that allows any KDE @@ -322,8 +354,10 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{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 @@ -349,14 +383,18 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{tde_libdir}/libkttsd.so.* %{tde_tdeappdir}/kcmkttsd.desktop %{tde_tdeappdir}/kttsmgr.desktop -%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc +%{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 @@ -371,8 +409,6 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{tde_datadir}/servicetypes/kttsd_audioplugin.desktop %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png -%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz %{tde_tdedocdir}/HTML/en/kttsd/ %post -n trinity-kttsd @@ -394,8 +430,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## %package -n trinity-kttsd-contrib-plugins -Summary: the TDE Text-to-Speech system -Group: User Interface/Desktops +Summary: The TDE Text-to-Speech system +Group: System/GUI/Other Requires: trinity-kttsd = %{version}-%{release} %description -n trinity-kttsd-contrib-plugins @@ -420,16 +456,19 @@ This package is part of Trinity, as a component of the TDE accessibility module. ########## %package devel -Summary: Development files for %{name} -Group: Development/Libraries +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 -%{summary}. +This package contains the development file for TDE accessibility +programs. %files devel %defattr(-,root,root,-) @@ -437,6 +476,7 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} %{tde_libdir}/libkttsd.so %{tde_libdir}/libKTTSD_Lib.la %{tde_libdir}/libKTTSD_Lib.so +%{tde_tdeincludedir}/ksayit_fxplugin.h %post devel /sbin/ldconfig ||: @@ -446,7 +486,7 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -455,8 +495,11 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -492,7 +535,7 @@ fi --enable-rpath \ \ --enable-ksayit-audio-plugins \ - --with-akode + %{?with_akode:--with-akode} %{?!with_akode:--without-akode} %__make %{?_smp_mflags} @@ -502,14 +545,39 @@ 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 -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc b/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec index 2758ba766..5d546fb8e 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeaddons +# spec file for package tdeaddons (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -20,7 +20,9 @@ # Having KDE libraries may cause FTBFS here ! # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -33,16 +35,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Plugins Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: User Interface/Desktops URL: http://www.trinitydesktop.org/ @@ -113,6 +110,9 @@ BuildRequires: gamin-devel BuildRequires: pcre-devel %endif +# ACL support +BuildRequires: libacl-devel + # DB4/DB5 support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 @@ -190,20 +190,6 @@ America and Europe. %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png %{tde_tdedocdir}/HTML/en/atlantikdesigner/ -%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 @@ -399,18 +385,6 @@ controls XMMS, install the xmms-kde-trinity package. %{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 @@ -597,18 +571,6 @@ graphical disk usage viewer and image conversions and transformations. %{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 @@ -634,20 +596,6 @@ signatures in external mail clients such as KMail. %{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 @@ -705,18 +653,6 @@ of user interfaces, playlists and visualisation plugins. %{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%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -812,5 +748,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec index 4dca62ca8..ea4c3ccfa 100644 --- a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeaddons Summary: Trinity Desktop Environment - Plugins Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -687,7 +682,7 @@ done %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -738,9 +733,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec index 0b1312a57..668e97ccb 100644 --- a/redhat/main/tdeadmin/tdeadmin-14.0.0.spec +++ b/redhat/main/tdeadmin/tdeadmin-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeadmin (version R14.0.0) +# spec file for package tdeadmin (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,14 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity +%define tde_sbindir %{tde_prefix}/sbin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -39,7 +43,7 @@ Name: trinity-%{tde_pkg} Summary: Administrative tools for TDE Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -99,7 +103,6 @@ BuildRequires: pam-devel BuildRequires: lilo %endif -Requires: trinity-tdeadmin = %{version}-%{release} Requires: trinity-kcron = %{version}-%{release} Requires: trinity-kdat = %{version}-%{release} Requires: %{name}-kfile-plugins = %{version}-%{release} @@ -147,20 +150,6 @@ It is a graphical user interface to cron, the UNIX system scheduler. %{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 @@ -188,20 +177,6 @@ Main features are: %{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 @@ -245,18 +220,6 @@ can be used to manage network devices and settings for each device. %{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 @@ -274,24 +237,10 @@ install/remove them. %{tde_bindir}/kpackage %{tde_tdeappdir}/kpackage.desktop %{tde_datadir}/apps/kpackage/ -%{tde_datadir}/config/kpackagerc +%{tde_confdir}/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 @@ -308,27 +257,13 @@ drag and drop GUI. %{tde_bindir}/ksysv %{tde_tdeappdir}/ksysv.desktop %{tde_datadir}/apps/ksysv/ -%{tde_datadir}/config/ksysvrc +%{tde_confdir}/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 @@ -354,7 +289,7 @@ A user/group administration tool for TDE. %{tde_bindir}/kuser %{tde_tdeappdir}/kuser.desktop %{tde_datadir}/apps/kuser/ -%{tde_datadir}/config/kuserrc +%{tde_confdir}/kuserrc %{tde_datadir}/config.kcfg/kuser.kcfg %{tde_datadir}/icons/hicolor/*/apps/kuser.png %{tde_tdedocdir}/HTML/en/kuser/ @@ -366,20 +301,6 @@ A user/group administration tool for TDE. %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} @@ -420,13 +341,14 @@ touch /etc/lilo.conf %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 export PATH="%{tde_bindir}:${PATH}" +export kde_confdir="%{tde_confdir}" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then @@ -453,7 +375,11 @@ fi --with-rpm \ --with-pam=kde \ --with-shadow \ - --with-private-groups + --with-private-groups \ +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 + --with-first-uid=1000 \ + --with-first-gid=1000 \ +%endif %__make %{?_smp_mflags} || %__make @@ -470,7 +396,8 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser" %{buildroot}%{tde_sbindir} \ %{buildroot}%{_sbindir} -%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/ +%__mkdir_p "%{buildroot}%{tde_confdir}/" +%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/" %if 0%{?with_consolehelper} # Run kuser through consolehelper @@ -529,5 +456,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec index 38e835e4e..c6377059d 100644 --- a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec +++ b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec @@ -1,43 +1,60 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} - - -Name: trinity-tdeadmin -Summary: Administrative tools for TDE -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -License: GPLv2 -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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/ -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Prefix: %{tde_prefix} +#Vendor: Trinity Project +#Packager: Francois Andriot <francois.andriot@free.fr> -Obsoletes: trinity-kdeadmin < %{version}-%{release} -Provides: trinity-kdeadmin = %{version}-%{release} +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: kuser.pam @@ -46,17 +63,39 @@ Source5: kpackagerc Source6: ksysvrc Source7: kuserrc -BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} +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 +#define with_lilo 1 %endif - %if 0%{?with_lilo} BuildRequires: lilo %endif @@ -70,6 +109,8 @@ 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 @@ -96,7 +137,7 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser. %package -n trinity-kcron Summary: The Trinity crontab editor -Group: Applications/Utilities +Group: System/GUI/Other %description -n trinity-kcron KCron is an application for scheduling programs to run in the background. @@ -106,7 +147,7 @@ It is a graphical user interface to cron, the UNIX system scheduler. %defattr(-,root,root,-) %{tde_bindir}/kcron %{tde_tdeappdir}/kcron.desktop -%{tde_datadir}/apps/kcron/kcronui.rc +%{tde_datadir}/apps/kcron/ %{tde_datadir}/icons/hicolor/*/apps/kcron.png %{tde_tdedocdir}/HTML/en/kcron/ @@ -128,7 +169,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kdat Summary: A Trinity tape backup tool -Group: Applications/Utilities +Group: System/GUI/Other %description -n trinity-kdat KDat is a tar-based tape archiver. It is designed to work with multiple @@ -169,10 +210,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package kfile-plugins Summary: Trinity file metainfo plugins for deb and rpm files -Group: Environment/Libraries +Group: System/GUI/Other %description kfile-plugins -File metainfo plugins for deb and rpm package files. +This package contains the Trinity File metainfo plugins for deb and rpm +package files. %files kfile-plugins %defattr(-,root,root,-) @@ -187,7 +229,7 @@ File metainfo plugins for deb and rpm package files. %package -n trinity-knetworkconf Summary: Trinity network configuration tool -Group: Applications/Utilities +Group: System/GUI/Other %description -n trinity-knetworkconf This is a TDE control center module to configure TCP/IP settings. It @@ -223,7 +265,7 @@ done %package -n trinity-kpackage Summary: Trinity package management tool -Group: Applications/Utilities +Group: System/GUI/Other %description -n trinity-kpackage This is a frontend to both .rpm and .deb package formats. It allows you @@ -258,7 +300,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ksysv Summary: Trinity SysV-style init configuration editor -Group: Applications/Utilities +Group: System/GUI/Other %description -n trinity-ksysv This program allows you to edit your start and stop scripts using a @@ -295,7 +337,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kuser Summary: Trinity user/group administration tool -Group: Applications/Utilities +Group: System/GUI/Other %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' @@ -347,7 +389,7 @@ 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: Applications/Utilities +Group: System/GUI/Other Requires: trinity-kcontrol Requires: trinity-tdebase-bin #Requires: lilo @@ -372,7 +414,7 @@ touch /etc/lilo.conf ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -382,7 +424,7 @@ touch /etc/lilo.conf %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -468,14 +510,29 @@ done # * 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 -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec index 78ebaffcd..3d31f7233 100644 --- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeartwork (version R14.0.0) +# spec file for package tdeartwork (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -39,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Additional artwork (themes, sound themes, ...) for TDE Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -74,6 +76,9 @@ BuildRequires: libidn-devel # ESOUND support BuildRequires: esound-devel +# ACL support +BuildRequires: libacl-devel + # MESA support %if 0%{?rhel} || 0%{?fedora} BuildRequires: mesa-libGL-devel @@ -98,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} || 0%{?with_xscreensaver} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -106,7 +111,7 @@ BuildRequires: libXScrnSaver-devel BuildRequires: xscreensaver BuildRequires: xscreensaver-base BuildRequires: xscreensaver-extras -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} BuildRequires: xscreensaver-extras-base %endif BuildRequires: xscreensaver-gl-base @@ -140,7 +145,7 @@ BuildRequires: xscreensaver-gl %endif # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_jack 1 %if 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel %{_lib}jack-devel @@ -161,6 +166,9 @@ BuildRequires: %{jack_devel} BuildRequires: gamin-devel %endif +# OPENSSL support +BuildRequires: openssl-devel + # Metapackage Requires: %{name}-emoticons = %{version}-%{release} @@ -273,18 +281,6 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/icons/locolor/index.theme %{tde_datadir}/icons/locolor/*/*/*.png -%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 @@ -485,11 +481,38 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %{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 +%endif +%if 0%{?rhel} == 5 +%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop +%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop +%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop +%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop +%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop +%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop +%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop +%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop +%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop +%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop +%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop +%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop +%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop +%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop +%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop +%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop +%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop +%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop +%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop +%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop +%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop +%endif + +%endif ########## @@ -548,177 +571,122 @@ 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 -%if 0%{?rhel} != 7 -%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop -%endif -%{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 || 0%{?mgaversion} || 0%{?fedora} >= 15 || 0%{?pclinuxos} -%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop -%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop -%endif - -%if 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 15 || 0%{?pclinuxos} -%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop -%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop -%endif - -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7 -%{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 || 0%{?rhel} >= 7 -%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop -%endif - -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 -%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop -%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop -%endif - -%if 0%{?fedora} >= 20 -%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop -%endif - -%endif +%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop +%endif +%if 0%{?rhel} == 5 +%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/critical.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/flag.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/forest.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/laser.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/vines.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop +%endif + +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop + +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop +%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop + +%{tde_datadir}/applnk/System/ScreenSavers/*.desktop ########## @@ -796,18 +764,9 @@ chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage" chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file" %endif -# Fix missing screensavers on Fedora 20 -%if 0%{?with_xscreensaver} && 0%{?fedora} >= 20 -touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop" -touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop" -touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop" -%endif - %clean %__rm -rf %{buildroot} %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec index 87f00043e..e1d12b94c 100644 --- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec +++ b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -23,7 +18,7 @@ Name: trinity-tdeartwork Summary: Additional artwork (themes, sound themes, ...) for TDE Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2 Group: User Interface/Desktops @@ -747,8 +742,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 @@ -0,0 +1,5 @@ +#%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.kcheckpass-trinity.fc22 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22 @@ -0,0 +1,5 @@ +#%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.fc23 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 @@ -0,0 +1,5 @@ +#%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.fc24 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 @@ -0,0 +1,5 @@ +#%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.kcheckpass-trinity.fc25 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25 @@ -0,0 +1,5 @@ +#%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.fc26 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 @@ -0,0 +1,5 @@ +#%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.fc27 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 @@ -0,0 +1,5 @@ +#%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.fc28 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 @@ -0,0 +1,5 @@ +#%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.mga5 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 @@ -0,0 +1,5 @@ +#%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.mga6 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 @@ -0,0 +1,5 @@ +#%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.pclos2015 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 @@ -0,0 +1,5 @@ +#%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.pclos2016 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 @@ -0,0 +1,5 @@ +#%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.pclos2017 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 @@ -0,0 +1,5 @@ +#%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.pclos2018 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 @@ -0,0 +1,5 @@ +#%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.kdm-trinity-np.fc21 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 @@ -0,0 +1,11 @@ +#%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.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 @@ -0,0 +1,11 @@ +#%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.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 @@ -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.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 @@ -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.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 @@ -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.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 @@ -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.fc21 b/redhat/main/tdebase/pamd.kdm-trinity.fc21 new file mode 100644 index 000000000..686433fce --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc21 @@ -0,0 +1,19 @@ +#%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 new file mode 100644 index 000000000..e72140962 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc22 @@ -0,0 +1,21 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc23 b/redhat/main/tdebase/pamd.kdm-trinity.fc23 new file mode 100644 index 000000000..e72140962 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc23 @@ -0,0 +1,21 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc24 b/redhat/main/tdebase/pamd.kdm-trinity.fc24 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc24 @@ -0,0 +1,23 @@ +#%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.fc25 b/redhat/main/tdebase/pamd.kdm-trinity.fc25 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc25 @@ -0,0 +1,23 @@ +#%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.fc26 b/redhat/main/tdebase/pamd.kdm-trinity.fc26 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc26 @@ -0,0 +1,23 @@ +#%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.fc27 b/redhat/main/tdebase/pamd.kdm-trinity.fc27 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc27 @@ -0,0 +1,23 @@ +#%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 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc28 @@ -0,0 +1,23 @@ +#%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.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga5 @@ -0,0 +1,15 @@ +#%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 +-auth optional pam_kwallet.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 +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga6 @@ -0,0 +1,15 @@ +#%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 +-auth optional pam_kwallet.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 +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 @@ -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.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 @@ -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.pclos2017 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 @@ -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.pclos2018 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 @@ -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.fc21 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 @@ -0,0 +1,5 @@ +#%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 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 @@ -0,0 +1,5 @@ +#%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.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 @@ -0,0 +1,5 @@ +#%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.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 @@ -0,0 +1,5 @@ +#%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.pclos2015 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 @@ -0,0 +1,5 @@ +#%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.pclos2016 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 @@ -0,0 +1,5 @@ +#%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.pclos2017 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 @@ -0,0 +1,5 @@ +#%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.pclos2018 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 @@ -0,0 +1,5 @@ +#%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/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 0844117f2..f87ab705a 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdebase (version R14.0.0) +# spec file for package tdebase (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,15 +12,18 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdebase %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,15 +37,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde starttde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -60,7 +58,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: trinity-tdebase-rpmlintrc +Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 @@ -71,7 +69,9 @@ Source5: pamd.kscreensaver-trinity%{?dist} %endif # openSUSE: configuration file for TDM +%if 0%{?suse_version} >= 1210 Source6: suse-displaymanagers-tdm +%endif # Fedora 18: use SYSTEMD for TDM startup %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -80,7 +80,7 @@ Source7: tdm.service%{?dist} # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! %if 0%{?suse_version} == 1140 -Source7: xdm.oss114 +Source7: xdm%{?dist} %endif # Fedora >= 17: special selinux policy required for TDM @@ -170,6 +170,70 @@ Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif +# Fedora 21 Theme +%if 0%{?fedora} == 21 +Requires: f21-backgrounds-base +%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 22 Theme +%if 0%{?fedora} == 22 +Requires: f22-backgrounds-base +%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 23 Theme +%if 0%{?fedora} == 23 +Requires: f23-backgrounds-base +%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 24 Theme +%if 0%{?fedora} == 24 +Requires: f24-backgrounds-base +%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 25 Theme +%if 0%{?fedora} == 25 +Requires: f25-backgrounds-base +%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 26 Theme +%if 0%{?fedora} == 26 +Requires: f26-backgrounds-base +%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 27 Theme +%if 0%{?fedora} == 27 +Requires: f27-backgrounds-base +%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 28 Theme +%if 0%{?fedora} == 28 +Requires: f28-backgrounds-base +%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -220,6 +284,20 @@ Requires: mageia-theme-Default %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg %endif +# Mageia 5 Theme +%if 0%{?mgaversion} == 5 +Requires: mageia-theme-Default +%define tde_bg /usr/share/mga/backgrounds/default.jpg +%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg +%endif + +# Mageia 6 Theme +%if 0%{?mgaversion} == 6 +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 @@ -235,7 +313,7 @@ Requires: desktop-common-data # OpenSuse 11.4 Theme %if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding = 11.4 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -243,7 +321,7 @@ Requires: hicolor-icon-theme-branding = 11.4 %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 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -251,7 +329,7 @@ Requires: hicolor-icon-theme-branding = 12.2 %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 = 12.3 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -259,7 +337,7 @@ Requires: hicolor-icon-theme-branding = 12.3 %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 +Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif @@ -267,7 +345,39 @@ Requires: hicolor-icon-theme-branding = 13.1 %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 = 13.2 +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse 42.1 Theme +%if "%{?sle_version}" == "120100" +Requires: wallpaper-branding = 42.1 +%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 42.2 Theme +%if "%{?sle_version}" == "120200" +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 42.3 Theme +%if "%{?sle_version}" == "120300" +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 15.0 Theme +%if "%{?suse_version}" == "1500" +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 @@ -311,9 +421,11 @@ BuildRequires: %{_lib}sasl2-devel BuildRequires: cyrus-sasl-devel %endif -# LIBUSB support +# PAM support BuildRequires: pam-devel -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} + +# LIBUSB support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else @@ -337,10 +449,14 @@ BuildRequires: gamin-devel %endif # OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel -%else -BuildRequires: openldap-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel %endif # SENSORS support @@ -354,11 +470,17 @@ BuildRequires: libsensors4-devel # 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} +%if 0%{?suse_version} >= 1310 +BuildRequires: udev +%endif BuildRequires: libudev-devel %define with_tsak 1 %define with_tdehwlib 1 %endif +# ACL support +BuildRequires: libacl-devel + # XRANDR support # On RHEL5, xrandr library is too old. %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} @@ -386,17 +508,42 @@ BuildRequires: OpenEXR-devel %endif # XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +# RHEL 4: disabled +# 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} %define with_xscreensaver 1 -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} + +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extras +%if 0%{?fedora} +BuildRequires: xscreensaver-extras-base +%endif +BuildRequires: xscreensaver-gl-base +BuildRequires: xscreensaver-gl-extras +%endif + +%if 0%{?suse_version} BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra %endif + %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 %endif @@ -533,7 +680,37 @@ BuildRequires: drakconf # LIBCONFIG support # Needed for "compton" stuff +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%define with_libconfig 1 BuildRequires: libconfig-devel +%endif + +# KBDLEDSYNC support +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%define with_kbdledsync 1 +%endif + +# TDERANDR support +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%define with_tderandrtray 1 +%endif + +# ELFICON support +%if 0 +%define with_elficon 1 +BuildRequires: libr-devel >= 0.6.0 +%endif + +# RPC support +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1550 +BuildRequires: libtirpc-devel +BuildRequires: rpcgen +%if 0%{?fedora} +BuildRequires: libnsl2-devel +%else +BuildRequires: libnsl-devel +%endif +%endif # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{version}-%{release} @@ -692,7 +869,6 @@ 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.* @@ -706,18 +882,6 @@ Such as the desktop right-click-"Create New" list %{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 @@ -737,20 +901,6 @@ creates menu entries for them. %{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 @@ -758,18 +908,12 @@ Summary: Common libraries used by kwrite and kate Group: System/GUI/Other %description -n trinity-libkateinterfaces -%{summary}. +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 @@ -815,22 +959,6 @@ Some random features: %{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 @@ -849,12 +977,6 @@ This package contains the development files fare Kate. %{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 @@ -880,20 +1002,6 @@ Kwrite is an advanced text editor for TDE. %{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 @@ -902,9 +1010,11 @@ Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} # Requires 'usb.ids' -Requires: usbutils +Requires: usbutils +BuildRequires: usbutils %if 0%{?suse_version} == 0 -Requires: hwdata +BuildRequires: hwdata +Requires: hwdata %endif %description -n trinity-kcontrol @@ -961,8 +1071,10 @@ plugdev group. %{tde_tdelibdir}/kcm_fontinst.so %{tde_tdelibdir}/kcm_fonts.la %{tde_tdelibdir}/kcm_fonts.so +%if 0%{?with_tdehwlib} %{tde_tdelibdir}/kcm_hwmanager.la %{tde_tdelibdir}/kcm_hwmanager.so +%endif %{tde_tdelibdir}/kcm_icons.la %{tde_tdelibdir}/kcm_icons.so %{tde_tdelibdir}/kcm_info.la @@ -1062,7 +1174,9 @@ plugdev group. %{tde_tdeappdir}/filebrowser.desktop %{tde_tdeappdir}/filetypes.desktop %{tde_tdeappdir}/fonts.desktop +%if 0%{?with_tdehwlib} %{tde_tdeappdir}/hwmanager.desktop +%endif %{tde_tdeappdir}/icons.desktop %{tde_tdeappdir}/installktheme.desktop %{tde_tdeappdir}/interrupts.desktop @@ -1168,8 +1282,15 @@ plugdev group. %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png %{tde_tdedocdir}/HTML/en/tdefontview/ +# tdehwtray +%if "%{?tde_version}" == "14.1.0" +%{tde_bindir}/tdehwdevicetray +%{tde_tdeappdir}/tdehwdevicetray.desktop +%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop +%endif + # 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} +%if 0%{?with_tderandrtray} %{tde_bindir}/tderandrtray %{tde_tdelibdir}/kcm_displayconfig.la %{tde_tdelibdir}/kcm_displayconfig.so @@ -1185,14 +1306,6 @@ plugdev group. %{tde_tdedocdir}/HTML/en/tderandrtray/ %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 @@ -1208,12 +1321,6 @@ Requires: trinity-kcontrol = %{version}-%{release} %{tde_libdir}/libtdefontinst.la %{tde_libdir}/libtdefontinst.so -%post -n trinity-kcontrol-devel -/sbin/ldconfig || : - -%postun -n trinity-kcontrol-devel -/sbin/ldconfig || : - ########## %package bin @@ -1221,6 +1328,11 @@ 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} @@ -1235,7 +1347,9 @@ TDE applications, particularly those in the TDE base module. %if 0%{?with_tsak} %{tde_bindir}/tsak %endif +%if 0%{?with_libconfig} %{tde_bindir}/compton-tde +%endif %{tde_bindir}/tdedebugdialog %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig @@ -1289,6 +1403,9 @@ TDE applications, particularly those in the TDE base module. %{tde_libdir}/libtdeinit_kxkb.la %{tde_libdir}/libtdeinit_kxkb.so %{tde_libdir}/libkhotkeys_shared.so.* +%if "%{?tde_version}" == "14.1.0" +%{tde_tdeappdir}/kdcop.desktop +%endif %{tde_tdeappdir}/keyboard.desktop %{tde_tdeappdir}/keyboard_layout.desktop %{tde_tdeappdir}/khotkeys.desktop @@ -1300,7 +1417,6 @@ TDE applications, particularly those in the TDE base module. %{tde_datadir}/apps/tdeconf_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 @@ -1315,21 +1431,17 @@ TDE applications, particularly those in the TDE base module. # SETUID binaries # Some setuid binaries need special care %if 0%{?suse_version} -%if 0%{?with_tsak} -%verify(not mode) %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak} %verify(not mode) %{tde_bindir}/kcheckpass -%verify(not mode) %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync} %else -%if 0%{?with_tsak} -%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak} %attr(4755,root,root) %{tde_bindir}/kcheckpass -%attr(4755,root,root) %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync} %endif # SUSE's runupdater utility -%if 0%{?opensuse_bs} == 0 && 0%{?suse_version} +%if 0 %{tde_bindir}/runupdater %{tde_libdir}/libtdeinit_runupdater.la %{tde_libdir}/libtdeinit_runupdater.so @@ -1339,21 +1451,13 @@ TDE applications, particularly those in the TDE base module. %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 +%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak} %set_permissions %{tde_bindir}/kcheckpass -%set_permissions %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync} %endif -%postun bin -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - ########## %package bin-devel @@ -1366,19 +1470,14 @@ Obsoletes: tdebase-bin-devel < %{version}-%{release} Provides: tdebase-bin-devel = %{version}-%{release} %description bin-devel -%{summary}. +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 @@ -1651,6 +1750,7 @@ needed for a basic TDE desktop installation. %{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 @@ -1660,11 +1760,6 @@ needed for a basic TDE desktop installation. %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ %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 @@ -1681,12 +1776,6 @@ if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920 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 @@ -1796,6 +1885,7 @@ group. %{tde_datadir}/apps/tdeio_info/ %{tde_datadir}/apps/tdeio_man/ %{tde_datadir}/apps/systemview/ +%{tde_datadir}/autostart/mediabackend.desktop %{tde_datadir}/config.kcfg/mediamanagersettings.kcfg %{tde_datadir}/mimelnk/application/x-smb-server.desktop %{tde_datadir}/mimelnk/inode/system_directory.desktop @@ -1844,21 +1934,23 @@ group. %{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/services/tdefile_trash.desktop %{tde_tdedocdir}/HTML/en/tdeioslave/ + %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so %{tde_datadir}/services/exrthumbnail.desktop %endif + # HWManager %{tde_tdelibdir}/media_propsdlgplugin.la %{tde_tdelibdir}/media_propsdlgplugin.so %{tde_datadir}/services/media_propsdlgplugin.desktop -%post tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : +%if "%{tde_version}" == "14.1.0" +%{tde_tdelibdir}/ktrashpropsdlgplugin.la +%{tde_tdelibdir}/ktrashpropsdlgplugin.so +%{tde_datadir}/services/ktrashpropsdlgplugin.desktop +%endif ########## @@ -1912,12 +2004,6 @@ system passwords. %{_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 @@ -1979,22 +2065,6 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_tdedocdir}/HTML/en/tdeprintfax/ %{tde_tdedocdir}/HTML/en/kjobviewer/ -%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 @@ -2034,20 +2104,6 @@ the TDE desktop. %{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 @@ -2056,7 +2112,7 @@ Group: Development/Libraries/Other Requires: trinity-kdesktop = %{version}-%{release} %description -n trinity-kdesktop-devel -%{summary}. +This package contains the development files for kdesktop. %files -n trinity-kdesktop-devel %defattr(-,root,root,-) @@ -2132,18 +2188,17 @@ already. Most users won't need this. %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_confdir}/%{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 +%if "%{?tde_version}" == "14.1.0" +%{tde_bindir}/tdecryptocardwatcher +%endif + # XDG user faces %dir %{_datadir}/faces %{_datadir}/faces/default1.png @@ -2162,7 +2217,7 @@ already. Most users won't need this. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %{_datadir}/xsessions/tde.desktop %endif @@ -2208,10 +2263,19 @@ fi %if 0%{?mgaversion} || 0%{?mdkversion} %make_session %endif + +# SELINUX context for tdm %if 0%{?with_selinux_policy} /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" %endif +%if 0%{?fedora} == 21 || 0%{?rhel} >= 7 +if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then + echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local" + restorecon "%{tde_bindir}/tdm" +fi +%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" @@ -2230,6 +2294,10 @@ if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm" fi +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || : +%endif %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' @@ -2243,6 +2311,11 @@ fi %make_session %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || : +%endif + ########## %package -n trinity-tdm-devel @@ -2252,7 +2325,7 @@ Requires: trinity-tdm = %{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel -%{summary}. +This package contains the development files for TDM. %files -n trinity-tdm-devel %defattr(-,root,root,-) @@ -2281,20 +2354,6 @@ workstations. %{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 @@ -2328,22 +2387,6 @@ documentation. %{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 @@ -2461,22 +2504,6 @@ functionality. %{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 @@ -2486,7 +2513,7 @@ Requires: trinity-kicker = %{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel -%{summary}. +This package contains the development files for kicker. %files -n trinity-kicker-devel %defattr(-,root,root,-) @@ -2503,12 +2530,6 @@ Requires: trinity-kicker = %{version}-%{release} %{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 @@ -2542,22 +2563,6 @@ web browser if the clipboard contains a URL. %{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 @@ -2587,14 +2592,6 @@ structure. %{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 @@ -2729,12 +2726,6 @@ ever launching another application. %{tde_tdedocdir}/HTML/en/keditbookmarks/ %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 \ @@ -2743,14 +2734,6 @@ if [ $1 -eq 1 ]; then 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 \ @@ -2766,7 +2749,7 @@ Group: Development/Libraries/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-devel -%{summary}. +This package contains the development files for konqueror. %files -n trinity-konqueror-devel %defattr(-,root,root,-) @@ -2775,12 +2758,6 @@ Requires: trinity-konqueror = %{version}-%{release} %{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 @@ -2802,12 +2779,6 @@ This package includes support for Netscape plugins in Konqueror. %{tde_tdeappdir}/tdehtml_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 @@ -2861,22 +2832,6 @@ Using Konsole, a user can open: %{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 @@ -2897,20 +2852,6 @@ applications. It is used to switch between applications or desktops. %{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 @@ -2932,20 +2873,6 @@ automatically started. KPersonalizer can also be called later. %{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 @@ -2982,17 +2909,25 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/ksmserver/ %post -n trinity-ksmserver -/sbin/ldconfig || : %if 0%{?mdkversion} || 0%{?mgaversion} fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : +%endif + %postun -n trinity-ksmserver -/sbin/ldconfig || : %if 0%{?mdkversion} || 0%{?mgaversion} fndSession %endif +# openSUSE 15.0 alternatives +%if 0%{?suse_version} >= 1500 +update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || : +%endif + ########## %package -n trinity-ksplash @@ -3029,14 +2964,6 @@ a TDE session is launched. %{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 @@ -3045,7 +2972,7 @@ Group: Development/Libraries/Other Requires: trinity-ksplash = %{version}-%{release} %description -n trinity-ksplash-devel -%{summary}. +This package contains the development files for ksplash. %files -n trinity-ksplash-devel %defattr(-,root,root,-) @@ -3053,12 +2980,6 @@ Requires: trinity-ksplash = %{version}-%{release} %{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 @@ -3085,22 +3006,6 @@ computer. %{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 @@ -3109,7 +3014,7 @@ Group: Development/Libraries/Other Requires: trinity-ksysguard = %{version}-%{release} %description -n trinity-ksysguard-devel -%{summary}. +This package contains the development files for ksysguard. %files -n trinity-ksysguard-devel %defattr(-,root,root,-) @@ -3117,12 +3022,6 @@ Requires: trinity-ksysguard = %{version}-%{release} %{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 @@ -3159,20 +3058,6 @@ ktip provides many useful tips on using TDE when you log in. %{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 @@ -3185,7 +3070,6 @@ This package contains the default X window manager for TDE. %files -n trinity-twin %defattr(-,root,root,-) -%{tde_bindir}/kompmgr %{tde_bindir}/twin %{tde_bindir}/twin_killer_helper %{tde_bindir}/twin_resumer_helper @@ -3227,22 +3111,6 @@ This package contains the default X window manager for TDE. %{tde_datadir}/icons/crystalsvg/*/apps/twin.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 @@ -3251,7 +3119,7 @@ Group: Development/Libraries/Other Requires: trinity-twin = %{version}-%{release} %description -n trinity-twin-devel -%{summary}. +This package contains the development files for twin. %files -n trinity-twin-devel %defattr(-,root,root,-) @@ -3265,12 +3133,6 @@ Requires: trinity-twin = %{version}-%{release} %{tde_libdir}/libtdecorations.la %{tde_libdir}/libtdecorations.so -%post -n trinity-twin-devel -/sbin/ldconfig || : - -%postun -n trinity-twin-devel -/sbin/ldconfig || : - ########## %package -n trinity-libkonq @@ -3300,12 +3162,6 @@ Konqueror and the kdesktop package. %{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 @@ -3352,12 +3208,6 @@ Konqueror libraries. %{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 @@ -3401,8 +3251,8 @@ Windows and Samba shares. %__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}|' + -e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \ + -e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|' %endif # TDE default directory and icon in startup script @@ -3460,6 +3310,11 @@ fi %__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop" -e "s|^Icon=.*|Icon=kcmcgi|" %__sed -i "tdeioslave/media/tdecmodule/media.desktop" -e "s|^Icon=.*|Icon=kcmmedia|" +# RHEL 5 does not support 'compton' +%if 0%{?with_libconfig} == 0 +%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/" +%endif + %build unset QTDIR QTINC QTLIB @@ -3472,6 +3327,16 @@ if [ -d "/usr/include/samba-4.0" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0" fi +# openldap 2.4 includes (CentOS 5) +if [ -d "/usr/include/openldap24" ]; then + RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}" +fi + +# libtirpc (fedora) +if [ -d "/usr/include/tirpc" ]; then + RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}" +fi + if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -3488,6 +3353,7 @@ fi -DWITH_GCC_VISIBILITY=ON \ \ -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}" \ @@ -3505,8 +3371,8 @@ fi -DWITH_XFIXES=ON \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_XEXT=ON \ + %{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \ + -DWITH_PCRE=ON \ %{?!with_xtest:-DWITH_XTEST=OFF} \ -DWITH_OPENGL=ON \ %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ @@ -3514,6 +3380,7 @@ fi -DWITH_LIBUSB=ON \ -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ + -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \ -DWITH_PAM=ON \ -DWITH_SHADOW=OFF \ -DWITH_XDMCP=ON \ @@ -3523,8 +3390,8 @@ fi -DWITH_SENSORS=ON \ %{?with_hal:-DWITH_HAL=ON} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ - -DWITH_ELFICON=OFF \ -DWITH_UPOWER=ON \ + %{?!with_elficon:-DWITH_ELFICON=OFF} \ \ -DBUILD_ALL=ON \ %if 0%{?suse_version} @@ -3536,7 +3403,11 @@ fi -DTDM_PAM_SERVICE="tdm-trinity" \ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ %endif + %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \ +%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 + -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ +%endif .. %__make %{?_smp_mflags} || %__make @@ -3553,7 +3424,7 @@ fi # 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} +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %__install -D -m 644 \ "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" @@ -3581,8 +3452,12 @@ EXEC=%{tde_bindir}/%{tdm} %if 0%{?pclinuxos} FNDSESSION_EXEC="/usr/sbin/chksession -k" %else +%if 0%{?mgaversion} >= 6 +FNDSESSION_EXEC="/usr/sbin/chksession" +%else FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" %endif +%endif EOF %endif @@ -3596,19 +3471,20 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 -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 +if [ -r "/usr/share/usb.ids" ]; then + %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" + %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" +elif [ -r "/usr/share/hwdata/usb.ids" ]; then + %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" + %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" +fi # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. @@ -3629,10 +3505,6 @@ EOF %__sed -i "s|kdm|tdm|g" "%{?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" @@ -3698,8 +3570,8 @@ for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/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/input-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,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-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/computer.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"/places/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"/places/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done @@ -3727,9 +3599,12 @@ popd %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop PrintingUtility %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop Graphics Viewer -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop +%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop Applet X-TDE-settings-desktop} %suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager %endif +if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then +%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop System Utility +fi # Icons from TDE Control Center should only be displayed in TDE for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do @@ -3746,16 +3621,19 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do done # Remove setuid bit on some binaries. -%if 0%{?with_tsak} -chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak" -%endif +%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"} chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" -chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" +%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"} # Fix permissions on shell scripts chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh" chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" +# Removes tderandrtray documentation, if not built. +%if 0%{?with_tderandrtray} == 0 +%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray" +%endif + # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" @@ -3767,14 +3645,10 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref %if 0%{?suse_version} # Check permissions on setuid files (openSUSE specific) %verifyscript -%if 0%{?with_tsak} -%verify_permissions -e %{tde_bindir}/%{tdm}tsak -%endif +%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak} %verify_permissions -e %{tde_bindir}/kcheckpass -%verify_permissions -e %{tde_bindir}/tdekbdledsync +%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync} %endif %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec index c349bc37e..6c4318f8d 100644 --- a/redhat/main/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -34,17 +34,12 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde startkde -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs -Group: User Interface/Desktops +Group: System/GUI/Other URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -99,6 +94,8 @@ Source8: tdm%{?dist}.pp 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} @@ -108,9 +105,17 @@ Provides: trinity-kdebase-extras = %{version}-%{release} Obsoletes: tdebase < %{version}-%{release} Provides: tdebase = %{version}-%{release} -%if 0%{?suse_version} # 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 @@ -287,7 +292,7 @@ Requires: indexhtml # OpenSuse 11.4 Theme %if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 11.4 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg Requires: opensuse-manuals_en @@ -297,9 +302,9 @@ Requires: opensuse-manuals_en # OpenSuse 12.2 Theme %if "%{?suse_version}" == "1220" -Requires: wallpaper-branding +Requires: wallpaper-branding = 12.2 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +Requires: hicolor-icon-theme-branding = 12.2 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg Requires: opensuse-manuals_en @@ -309,7 +314,7 @@ Requires: opensuse-manuals_en # OpenSuse 12.3 Theme %if "%{?suse_version}" == "1230" -Requires: wallpaper-branding +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 @@ -321,14 +326,26 @@ Requires: opensuse-manuals_en # OpenSuse 13.1 Theme %if "%{?suse_version}" == "1310" -Requires: wallpaper-branding +Requires: wallpaper-branding = 13.1 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding +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/doc/manual/opensuse-manuals_en/book.opensuse.startup.html +%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 @@ -337,6 +354,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: make +BuildRequires: fdupes # HTDIG support BuildRequires: htdig @@ -444,13 +462,10 @@ BuildRequires: OpenEXR-devel %endif # XSCREENSAVER support -# Disabled on RHEL4, RHEL >= 7 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver} -%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} %define with_xscreensaver 1 -%if 0%{?rhel} == 5 -BuildRequires: xorg-x11-proto-devel -BuildRequires: gnome-screensaver +%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} +BuildRequires: libXScrnSaver-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 @@ -459,17 +474,6 @@ BuildRequires: %{_lib}xscrnsaver-devel BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %endif -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 -BuildRequires: xscreensaver -BuildRequires: libXScrnSaver-devel -%if 0%{?suse_version} -BuildRequires: xscreensaver-data-extra -%endif -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: xscreensaver -%endif -%endif %endif # AVAHI support @@ -560,14 +564,15 @@ BuildRequires: libXdmcp-devel # XTST support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel +%define xtst_devel %{_lib}xtst-devel %else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel +%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel %endif %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXtst-devel +%define xtst_devel libXtst-devel %endif +%{?xtst_devel:BuildRequires: %{xtst_devel}} # XDAMAGE support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -682,7 +687,7 @@ web browser, X terminal emulator, and many other programs and components. %package devel Summary: %{summary} - Development files -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs-devel >= %{tde_version} @@ -722,7 +727,7 @@ Kate plugins or TWin styles. %package tdeio-pim-plugins Summary: PIM TDEIOslaves from %{name} -Group: Environment/Libraries +Group: System/GUI/Other Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release} Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release} @@ -761,7 +766,7 @@ Protocol handlers (TDEIOslaves) for personal information management, including: %package runtime-data-common Summary: Shared common files for Trinity and KDE4 -Group: Environment/Libraries +Group: System/GUI/Other Provides: tdebase-runtime-data-common = %{version}-%{release} Obsoletes: tdebase-runtime-data-common < %{version}-%{release} @@ -802,7 +807,7 @@ done %package -n trinity-kappfinder Summary: Non-TDE application finder for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kappfinder @@ -835,10 +840,10 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-libkateinterfaces Summary: Common libraries used by kwrite and kate -Group: Environment/Libraries +Group: System/GUI/Other %description -n trinity-libkateinterfaces -%{summary} +This package contains the kateinterface library. %files -n trinity-libkateinterfaces %defattr(-,root,root,-) @@ -854,7 +859,7 @@ Group: Environment/Libraries %package -n trinity-kate Summary: Advanced text editor for TDE -Group: Applications/Text +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-kwrite = %{version}-%{release} Requires: trinity-libkateinterfaces = %{version}-%{release} @@ -915,11 +920,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kate-devel Summary: Development files for kate -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kate = %{version}-%{release} %description -n trinity-kate-devel -%{summary} +This package contains the development files fare Kate. %files -n trinity-kate-devel %defattr(-,root,root,-) @@ -939,12 +944,12 @@ Requires: trinity-kate = %{version}-%{release} %package -n trinity-kwrite Summary: Advanced text editor for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-libkateinterfaces = %{version}-%{release} %description -n trinity-kwrite -Kwrite is a text editor for TDE. +Kwrite is an advanced text editor for TDE. %files -n trinity-kwrite %defattr(-,root,root,-) @@ -978,7 +983,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kcontrol Summary: Control center for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} # Requires 'usb.ids' @@ -1191,7 +1196,6 @@ plugdev group. %{tde_tdeappdir}/sound.desktop %{tde_tdeappdir}/spellchecking.desktop %{tde_tdeappdir}/style.desktop -%{tde_tdeappdir}/tde-kcontrol.desktop %{tde_tdeappdir}/useragent.desktop %{tde_tdeappdir}/xserver.desktop %{tde_datadir}/applnk/.hidden/energy.desktop @@ -1278,11 +1282,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-kcontrol-devel Summary: Development files for kcontrol -Group: Development/Libraries +Group: Development/Languages/Other Requires: trinity-kcontrol = %{version}-%{release} %description -n trinity-kcontrol-devel -%{summary} +This package contains the development files for Kcontrol. %files -n trinity-kcontrol-devel %defattr(-,root,root,-) @@ -1299,9 +1303,14 @@ Requires: trinity-kcontrol = %{version}-%{release} %package bin Summary: Core binaries for the TDE base module -Group: Applications/Utilities +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} @@ -1409,6 +1418,13 @@ TDE applications, particularly those in the TDE base module. %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 || : @@ -1418,14 +1434,16 @@ 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 +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 -%{summary} +This package contains the development files for core binaries for +the TDE base module %files bin-devel %defattr(-,root,root,-) @@ -1442,7 +1460,7 @@ Provides: tdebase-bin-devel = %{version}-%{release} %package data Summary: Shared data files for the TDE base module -Group: Environment/Libraries +Group: System/GUI/Other Requires: %{name}-runtime-data-common = %{version}-%{release} Obsoletes: tdebase-data < %{version}-%{release} @@ -1711,6 +1729,7 @@ needed for a basic TDE desktop installation. %{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 @@ -1752,7 +1771,7 @@ done %package tdeio-plugins Summary: Core I/O slaves for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: trinity-kdesktop = %{version}-%{release} Requires: cyrus-sasl Requires: psmisc @@ -1926,7 +1945,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-tdepasswd Summary: Password changer for TDE -Group: Applications/Utilities +Group: System/GUI/Other Obsoletes: trinity-kdepasswd < %{version}-%{release} Provides: trinity-kdepasswd = %{version}-%{release} @@ -1983,7 +2002,7 @@ update-desktop-database %{tde_tdeappdir} 2> /dev/null || : %package -n trinity-tdeprint Summary: Print system for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: psutils @@ -2058,7 +2077,7 @@ done %package -n trinity-kdesktop Summary: Miscellaneous binaries and files for the TDE desktop -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} Requires: trinity-libkonq = %{version}-%{release} @@ -2111,11 +2130,11 @@ done %package -n trinity-kdesktop-devel Summary: Development files for kdesktop -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kdesktop = %{version}-%{release} %description -n trinity-kdesktop-devel -%{summary} +This package contains the development files for kdesktop. %files -n trinity-kdesktop-devel %defattr(-,root,root,-) @@ -2127,7 +2146,7 @@ Requires: trinity-kdesktop = %{version}-%{release} %package -n trinity-tdm Summary: X Display manager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} Requires: pam @@ -2237,13 +2256,13 @@ already. Most users won't need this. %endif # Logrotate configuration -%config %{_sysconfdir}/logrotate.d/tdm +%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 + # 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 @@ -2306,11 +2325,12 @@ fi %package -n trinity-tdm-devel Summary: Development files for tdm -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-tdm = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel -%{summary} +This package contains the development files for TDM. %files -n trinity-tdm-devel %defattr(-,root,root,-) @@ -2320,7 +2340,7 @@ Requires: trinity-tdm = %{version}-%{release} %package -n trinity-kfind Summary: File-find utility for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kfind @@ -2357,7 +2377,7 @@ done %package -n trinity-khelpcenter Summary: Help center for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: htdig @@ -2406,7 +2426,7 @@ done %package -n trinity-kicker Summary: Desktop panel for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kicker @@ -2540,11 +2560,12 @@ done %package -n trinity-kicker-devel Summary: Development files for kicker -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kicker = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel -%{summary} +This package contains the development files for kicker. %files -n trinity-kicker-devel %defattr(-,root,root,-) @@ -2571,7 +2592,7 @@ Requires: trinity-kicker = %{version}-%{release} %package -n trinity-klipper Summary: Clipboard utility for Trinity -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-klipper @@ -2620,7 +2641,7 @@ done %package -n trinity-kmenuedit Summary: Menu editor for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kmenuedit @@ -2657,7 +2678,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-konqueror Summary: TDE's advanced file manager, web browser and document viewer -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-kcontrol = %{version}-%{release} Requires: %{name}-tdeio-plugins = %{version}-%{release} @@ -2769,6 +2790,7 @@ ever launching another application. %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 @@ -2818,11 +2840,11 @@ fi %package -n trinity-konqueror-devel Summary: Development files for konqueror -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-devel -%{summary} +This package contains the development files for konqueror. %files -n trinity-konqueror-devel %defattr(-,root,root,-) @@ -2841,7 +2863,7 @@ Requires: trinity-konqueror = %{version}-%{release} %package -n trinity-konqueror-nsplugins Summary: Netscape plugin support for Konqueror -Group: Applications/Utilities +Group: System/GUI/Other Requires: trinity-konqueror = %{version}-%{release} %description -n trinity-konqueror-nsplugins @@ -2868,7 +2890,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-konsole Summary: X terminal emulator for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-konsole @@ -2937,7 +2959,7 @@ done %package -n trinity-kpager Summary: Desktop pager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kpager @@ -2971,7 +2993,7 @@ done %package -n trinity-kpersonalizer Summary: Installation personalizer for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-kpersonalizer @@ -3006,7 +3028,7 @@ done %package -n trinity-ksmserver Summary: Session manager for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-twin = %{version}-%{release} @@ -3032,7 +3054,7 @@ TDE will start, but many good defaults will not be set. %{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/pics/shutdownkonq.png +%{tde_datadir}/apps/ksmserver/ # Workaround conflict with KDE4 %if "%{?tde_prefix}" != "/usr" @@ -3055,7 +3077,7 @@ fndSession %package -n trinity-ksplash Summary: The TDE splash screen -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ksplash @@ -3099,11 +3121,11 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %package -n trinity-ksplash-devel Summary: Development files for ksplash -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-ksplash = %{version}-%{release} %description -n trinity-ksplash-devel -%{summary} +This package contains the development files for ksplash. %files -n trinity-ksplash-devel %defattr(-,root,root,-) @@ -3121,7 +3143,7 @@ Requires: trinity-ksplash = %{version}-%{release} %package -n trinity-ksysguard Summary: System guard for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} Requires: trinity-ksysguardd = %{version}-%{release} @@ -3163,11 +3185,11 @@ done %package -n trinity-ksysguard-devel Summary: Development files for ksysguard -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-ksysguard = %{version}-%{release} %description -n trinity-ksysguard-devel -%{summary} +This package contains the development files for ksysguard. %files -n trinity-ksysguard-devel %defattr(-,root,root,-) @@ -3185,7 +3207,7 @@ Requires: trinity-ksysguard = %{version}-%{release} %package -n trinity-ksysguardd Summary: System guard daemon for TDE -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ksysguardd @@ -3201,8 +3223,8 @@ to monitor it through the daemon running there. ########## %package -n trinity-ktip -Summary: useful tips for TDE -Group: Applications/Utilities +Summary: Useful tips for TDE +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-ktip @@ -3235,7 +3257,7 @@ done %package -n trinity-twin Summary: The TDE window manager -Group: Applications/Utilities +Group: System/GUI/Other Requires: %{name}-data = %{version}-%{release} %description -n trinity-twin @@ -3304,11 +3326,11 @@ done %package -n trinity-twin-devel Summary: Development files for twin -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-twin = %{version}-%{release} %description -n trinity-twin-devel -%{summary} +This package contains the development files for twin. %files -n trinity-twin-devel %defattr(-,root,root,-) @@ -3332,7 +3354,7 @@ Requires: trinity-twin = %{version}-%{release} %package -n trinity-libkonq Summary: Core libraries for Konqueror -Group: Environment/Libraries +Group: System/GUI/Other %description -n trinity-libkonq These libraries are used by several TDE applications, most notably @@ -3367,7 +3389,7 @@ Konqueror and the kdesktop package. %package libtqt3-integration Summary: Integration library between TQt3 and TDE -Group: Environment/Libraries +Group: System/GUI/Other Obsoletes: tdebase-libtqt3-integration < %{version}-%{release} Provides: tdebase-libtqt3-integration = %{version}-%{release} @@ -3389,8 +3411,9 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %package -n trinity-libkonq-devel Summary: Development files for Konqueror's core libraries -Group: Development/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 @@ -3416,8 +3439,8 @@ Konqueror libraries. ########## %package tdeio-smb-plugin -Summary: Windows Connection Module for TDE -Group: Environment/Libraries +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 @@ -3437,7 +3460,7 @@ Windows and Samba shares. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -3445,6 +3468,7 @@ Windows and Samba shares. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%{?tde_patch:%patch1 -p1} # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" @@ -3474,8 +3498,13 @@ Windows and Samba shares. # TDE default directory and icon in startup script %__sed -i "%{starttde}" \ - -e "s|/opt/trinity|%{tde_prefix}|g" \ - -e "s|%%{tde_starticon}|%{tde_starticon}|g" + -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} @@ -3695,6 +3724,8 @@ chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop" # 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' @@ -3740,7 +3771,7 @@ EOF # logrotate configuration mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/tdm" +cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm" /var/log/tdm.log { weekly notifempty @@ -3759,56 +3790,55 @@ fi # 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/" +%__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 +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} -# Other applications -%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}/kprintfax.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 +%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 @@ -3821,7 +3851,7 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do done # Other apps that should stay in TDE -for i in ksysguard tde-kcontrol kfontview showdesktop; do +for i in ksysguard kfontview showdesktop; do echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop" done @@ -3831,6 +3861,12 @@ 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 @@ -3848,23 +3884,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5 -- Add logrotate configuration file. -- Add font configuration file. -- Install missing icons. - -* Sun May 18 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4 -- Fix Fedora 20 theme -- Fix some Mageia 4 path problems -- Forward port KDE SVN r803253 to fix potential security hole [Commit #c383da9d] - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option -- Fix XDG menu -- Fix Mageia/Mandriva specific icons - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdebase/tdm.fc19.te b/redhat/main/tdebase/tdm.fc19.te new file mode 100644 index 000000000..b42592f11 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc19.te @@ -0,0 +1,11 @@ + +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.fc21.pp b/redhat/main/tdebase/tdm.fc21.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc21.pp diff --git a/redhat/main/tdebase/tdm.fc21.te b/redhat/main/tdebase/tdm.fc21.te new file mode 100644 index 000000000..45d8a9a2c --- /dev/null +++ b/redhat/main/tdebase/tdm.fc21.te @@ -0,0 +1,11 @@ + +module tdm.fc20 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.fc22.pp b/redhat/main/tdebase/tdm.fc22.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc22.pp diff --git a/redhat/main/tdebase/tdm.fc22.te b/redhat/main/tdebase/tdm.fc22.te new file mode 100644 index 000000000..45d8a9a2c --- /dev/null +++ b/redhat/main/tdebase/tdm.fc22.te @@ -0,0 +1,11 @@ + +module tdm.fc20 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.fc23.pp b/redhat/main/tdebase/tdm.fc23.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc23.pp diff --git a/redhat/main/tdebase/tdm.fc24.pp b/redhat/main/tdebase/tdm.fc24.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc24.pp diff --git a/redhat/main/tdebase/tdm.fc25.pp b/redhat/main/tdebase/tdm.fc25.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc25.pp diff --git a/redhat/main/tdebase/tdm.fc26.pp b/redhat/main/tdebase/tdm.fc26.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc26.pp diff --git a/redhat/main/tdebase/tdm.fc27.pp b/redhat/main/tdebase/tdm.fc27.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc27.pp diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp Binary files differnew file mode 100644 index 000000000..d0c0d4be8 --- /dev/null +++ b/redhat/main/tdebase/tdm.fc28.pp diff --git a/redhat/main/tdebase/tdm.service.fc21 b/redhat/main/tdebase/tdm.service.fc21 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc21 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc22 b/redhat/main/tdebase/tdm.service.fc22 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc22 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc23 b/redhat/main/tdebase/tdm.service.fc23 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc23 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc24 b/redhat/main/tdebase/tdm.service.fc24 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc24 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc25 b/redhat/main/tdebase/tdm.service.fc25 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc25 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc26 b/redhat/main/tdebase/tdm.service.fc26 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc26 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc27 b/redhat/main/tdebase/tdm.service.fc27 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc27 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc28 b/redhat/main/tdebase/tdm.service.fc28 new file mode 100644 index 000000000..4c6136d94 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc28 @@ -0,0 +1,12 @@ +[Unit] +Description=The Trinity login manager +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/opt/trinity/bin/kdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/redhat/main/tdebase/trinity-tdebase-rpmlintrc b/redhat/main/tdebase/trinity-tdebase-rpmlintrc index ad8188f40..8d22f2fc6 100644 --- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc +++ b/redhat/main/tdebase/trinity-tdebase-rpmlintrc @@ -1 +1,3 @@ setBadness('permissions-file-setuid-bit', 0) +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index 9060e0f44..5256a254d 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdebindings (version R14.0.0) +# spec file for package tdebindings (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,16 +12,23 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # +# Required for PCLinuxOS: removes the ldflag '--no-undefined' +%if 0%{?pclinuxos} +%define _disable_ld_no_undefined 1 +%endif + # 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 tdebindings %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -35,11 +42,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Special note for RHEL4: # You must create symlink 'libgcj.so' manually because it does not exist by default. # E.g: @@ -50,7 +52,7 @@ Name: trinity-%{tde_pkg} Summary: TDE bindings to non-C++ languages Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -67,6 +69,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -119,16 +122,18 @@ BuildRequires: mozilla-xulrunner20-devel BuildRequires: openssl-devel # GTK1 support -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 5 %define with_gtk1 1 BuildRequires: glib-devel BuildRequires: gtk+-devel %endif -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +%if 0%{?with_gtk1} %define with_gtk1 1 BuildRequires: glib-devel BuildRequires: gtk+-devel %endif +%endif %if 0%{?mdkversion} == 201100 %define with_gtk1 1 BuildRequires: %{_lib}glib1.2-devel @@ -174,17 +179,35 @@ BuildRequires: ruby >= 1.8 %if 0%{?fedora} >= 19 BuildRequires: rubypick %endif + +# Check for Ruby library directory %if "%{?ruby_libarchdir}" != "" %define ruby_arch %{?ruby_libarchdir} %else +%if "%{?rb_archdir}" != "" +%define ruby_arch %{?rb_archdir} +%else +%if "%{%ruby_archdir}" != "" +%define ruby_arch %{?ruby_archdir} +%else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} +%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')} +%endif +%endif +%endif +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +%define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]') %endif %if "%{?ruby_libdir}" != "" %define ruby_rubylibdir %{?ruby_libdir} %else +%if "%{?rb_libdir}" != "" +%define ruby_rubylibdir %{?rb_libdir} +%else %{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} %endif +%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/') @@ -200,16 +223,22 @@ BuildRequires: gcc-java # PCLinuxOS use SUN's Java %if 0%{?pclinuxos} -BuildRequires: java-1.6.0-sun -BuildRequires: java-1.6.0-sun-devel +BuildRequires: java-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 +%if 0%{?suse_version} >= 1320 +BuildRequires: java-1_8_0-openjdk-devel +%endif +%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 +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 BuildRequires: java-1.7.0-openjdk-devel -%else +%endif +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 BuildRequires: java-1.6.0-openjdk-devel %endif @@ -246,7 +275,7 @@ Requires: trinity-tdebindings-java = %{version}-%{release} Requires: trinity-libsmoketqt = %{version}-%{release} Requires: trinity-libsmoketde = %{version}-%{release} Requires: perl-dcop = %{version}-%{release} -Requires: trinity-python-dcop = %{version}-%{release} +Requires: python-dcop = %{version}-%{release} Requires: trinity-libkjsembed1 = %{version}-%{release} Requires: trinity-kjscmd = %{version}-%{release} Requires: trinity-juic = %{version}-%{release} @@ -338,12 +367,6 @@ This package is part of the official TDE bindings module. %{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 @@ -389,12 +412,6 @@ This package is part of the official TDE bindings module. %{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 @@ -489,12 +506,6 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_libdir}/libsmoketqt.so.* -%post -n trinity-libsmoketqt -/sbin/ldconfig || : - -%postun -n trinity-libsmoketqt -/sbin/ldconfig || : - ########## %package -n trinity-libsmoketqt-devel @@ -522,12 +533,6 @@ This package is part of the official TDE bindings module. %{tde_libdir}/libsmoketqt.so %{tde_libdir}/libsmoketqt.la -%post -n trinity-libsmoketqt-devel -/sbin/ldconfig || : - -%postun -n trinity-libsmoketqt-devel -/sbin/ldconfig || : - ########## %package -n trinity-libsmoketde @@ -548,12 +553,6 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_libdir}/libsmoketde.so.* -%post -n trinity-libsmoketde -/sbin/ldconfig || : - -%postun -n trinity-libsmoketde -/sbin/ldconfig || : - ########## %package -n trinity-libsmoketde-devel @@ -580,12 +579,6 @@ This package is part of the official TDE bindings module. %{tde_libdir}/libsmoketde.so %{tde_libdir}/libsmoketde.la -%post -n trinity-libsmoketde-devel -/sbin/ldconfig || : - -%postun -n trinity-libsmoketde-devel -/sbin/ldconfig || : - ########## %package -n perl-dcop @@ -616,12 +609,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE ########## -%package -n trinity-python-dcop +%package -n python-dcop Summary: DCOP bindings for Python Group: System/Libraries Requires: python -%description -n trinity-python-dcop +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 @@ -629,7 +625,7 @@ communicating with running TDE applications. This package is part of the official TDE bindings module. -%files -n trinity-python-dcop +%files -n python-dcop %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so @@ -677,18 +673,6 @@ This package is part of the official TDE bindings module. %{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 @@ -714,12 +698,6 @@ This package is part of the official TDE bindings module. %{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 @@ -740,12 +718,6 @@ This package is part of the official TDE bindings module. %{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 @@ -796,12 +768,6 @@ This package is part of the official TDE bindings module. %{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 @@ -833,12 +799,6 @@ This package is part of the official TDE bindings module. %{ruby_arch}/tqui.la %doc qtruby/ChangeLog -%post -n trinity-libqt0-ruby -/sbin/ldconfig || : - -%postun -n trinity-libqt0-ruby -/sbin/ldconfig || : - ########## %if 0 @@ -877,12 +837,6 @@ xpart_notepad is a small XPart editor. Use it to understand how to use XPart. %{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} @@ -898,11 +852,6 @@ This package contains the xparts library for GTK. %{tde_libdir}/libgtkxparts.so.* %{tde_libdir}/libgtkxparts.la -%post -n trinity-libgtkxparts1 -/sbin/ldconfig || : - -%postun -n trinity-libgtkxparts1 -/sbin/ldconfig || : %endif ########## @@ -922,12 +871,6 @@ This package contains the xparts library for TDE. %{tde_libdir}/libtdexparts.so.* %{tde_libdir}/libtdexparts.la -%post -n trinity-libtdexparts -/sbin/ldconfig || : - -%postun -n trinity-libtdexparts -/sbin/ldconfig || : - ########## %package -n trinity-libxparts-devel @@ -949,12 +892,6 @@ This package contains the development files for Xparts library. %endif %{tde_libdir}/libtdexparts.so -%post -n trinity-libxparts-devel -/sbin/ldconfig || : - -%postun -n trinity-libxparts-devel -/sbin/ldconfig || : - ########## %package xparts-extras @@ -991,12 +928,6 @@ This package contains the DCOP bindings for 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 @@ -1013,12 +944,6 @@ This package contains the development files for DCOP bindings for C. %{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 @@ -1042,7 +967,7 @@ Requires: trinity-libqt3-jni-devel = %{version}-%{release} Requires: trinity-libtrinity-jni-devel = %{version}-%{release} %description devel -Development files for the TDE bindings. +This package contains the development files for the TDE bindings. %files devel %defattr(-,root,root,-) @@ -1064,21 +989,38 @@ exit 1 # [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" +%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \ + -i "korundum/rubylib/korundum/Korundum.cpp" \ + -e "s|rb_frame_this_func|rb_frame_last_func|g" +%endif + +# Another strange FTBFS in RHEL 5 +%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 +%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \ + -i "xparts/xpart_notepad/xp_notepad.cpp" \ + -e "/TDEApplication/ s| );|, true, true, true);|" %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|" + -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" + +# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd' +%if 0%{?fedora} >= 28 +%__sed -i "kjsembed/tdescript/swaptabs.js" \ + -i "kjsembed/stdlib/cmdline.js" \ + -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|" +%endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 TDEDIR=%{tde_prefix} unset JAVA_HOME ||: %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME} @@ -1092,20 +1034,23 @@ if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then fi # Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then +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 +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 +%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" %endif +%if 0%{?suse_version} >= 1330 +EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu" +%endif -# Warning: GCC visibility causes FTBFS [Bug #1285] +# Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -1136,8 +1081,7 @@ 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" +sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g" %__make OPTIMIZE="$RPM_OPT_FLAGS" ||: popd @@ -1201,5 +1145,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec index 3627cac01..1b0e5cd2f 100644 --- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec +++ b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -35,11 +35,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Special note for RHEL4: # You must create symlink 'libgcj.so' manually because it does not exist by default. # E.g: @@ -50,7 +45,7 @@ Name: trinity-%{tde_pkg} Summary: TDE bindings to non-C++ languages Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -68,20 +63,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -# [tdebindings] Fix RUBY path ending with '/' causing fail to install -Patch1: tdebindings-3.5.13.2-fix_ruby_path.patch - -# [tdebindings] Fix ruby 2.x detection -Patch2: tdebindings-3.5.13.2-fix_ruby2_detection.patch - -# [tdebindings] Fix automake 1.13 build issue -Patch3: admin-fix-parallel-test.diff - -# [kdebindings] Fix FTBFS in dcopjava/bindings -Patch4: kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch - -# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL5 -Patch5: kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch +%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -139,7 +121,7 @@ BuildRequires: openssl-devel BuildRequires: glib-devel BuildRequires: gtk+-devel %endif -%if 0%{?with_rhel} && 0%{?with_gtk1} +%if 0%{?rhel} == 5 %define with_gtk1 1 BuildRequires: glib-devel BuildRequires: gtk+-devel @@ -270,12 +252,13 @@ Requires: trinity-libqt0-ruby = %{version}-%{release} TDE/DCOP bindings to non-C++ languages %files +%defattr(-,root,root,-) ########## %package java Summary: TDE Java bindings metapackage [Trinity] -Group: Environment/Libraries +Group: System/Libraries Requires: trinity-libdcop3-java = %{version}-%{release} Requires: trinity-libdcop3-jni = %{version}-%{release} Requires: trinity-libqt3-java = %{version}-%{release} @@ -296,7 +279,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libdcop3-java Summary: DCOP bindings for Java [Trinity] -Group: Environment/Libraries +Group: System/Libraries Requires: trinity-libdcop3-jni = %{version}-%{release} @@ -315,7 +298,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libdcop3-java-devel Summary: DCOP bindings for Java (dcopidl2java program) [Trinity] -Group: Development/Libraries +Group: Development/Languages/Java Requires: trinity-libdcop3-java = %{version}-%{release} %description -n trinity-libdcop3-java-devel @@ -334,7 +317,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libdcop3-jni Summary: DCOP bindings for Java ( Native libraries ) [Trinity] -Group: Environment/Libraries +Group: System/Libraries %description -n trinity-libdcop3-jni This package contains the shared libraries and scripts necessary to @@ -359,7 +342,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libqt3-java Summary: Java bindings for Qt [Trinity] -Group: Environment/Libraries +Group: System/Libraries Requires: trinity-libdcop3-jni = %{version}-%{release} Requires: trinity-libqt3-jni = %{version}-%{release} Requires: trinity-juic = %{version}-%{release} @@ -383,7 +366,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libqt3-jni Summary: Java bindings for Qt ( Native libraries ) [Trinity] -Group: Environment/Libraries +Group: System/Libraries %description -n trinity-libqt3-jni This package contains the shared libraries necessary to run Java @@ -400,11 +383,17 @@ This package is part of the official TDE bindings module. %{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/Libraries +Group: Development/Languages/Java Requires: trinity-libqt3-jni = %{version}-%{release} %description -n trinity-libqt3-jni-devel @@ -420,8 +409,8 @@ This package is part of the official TDE bindings module. ########## %package -n trinity-libtrinity-java -Summary: tdelibs bindings for Java [Trinity] -Group: Environment/Libraries +Summary: Tdelibs bindings for Java [Trinity] +Group: System/Libraries Requires: trinity-libtrinity-jni = %{version}-%{release} @@ -442,8 +431,8 @@ This package is part of the official TDE bindings module. ########## %package -n trinity-libtrinity-jni -Summary: tdelibs bindings for java ( Native libraries ) [Trinity] -Group: Environment/Libraries +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 @@ -462,7 +451,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libtrinity-jni-devel Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity] -Group: Development/Libraries +Group: Development/Languages/Java Requires: trinity-libtrinity-jni = %{version}-%{release} %description -n trinity-libtrinity-jni-devel @@ -478,7 +467,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmokeqt1 Summary: SMOKE Binding Library to Qt -Group: Environment/Libraries +Group: System/Libraries %description -n trinity-libsmokeqt1 The "Scripting Meta Object Kompiler Engine" library is used by @@ -501,7 +490,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmokeqt-devel Summary: SMOKE Binding Library to Qt - Development Files -Group: Development/Libraries +Group: Development/Languages/Other Requires: trinity-libsmokeqt1 = %{version}-%{release} %description -n trinity-libsmokeqt-devel @@ -531,7 +520,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmoketde Summary: SMOKE Binding Library to TDE -Group: Environment/Libraries +Group: System/Libraries Obsoletes: trinity-libsmokekde1 < %{version}-%{release} Provides: trinity-libsmokekde1 = %{version}-%{release} @@ -557,7 +546,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmoketde-devel Summary: SMOKE Binding Library to TDE - Development Files -Group: Development/Libraries +Group: Development/Languages/Other Requires: trinity-libsmoketde = %{version}-%{release} Obsoletes: trinity-libsmokekde-devel < %{version}-%{release} @@ -587,17 +576,25 @@ This package is part of the official TDE bindings module. ########## -%package -n trinity-perl-dcop +%package -n perl-dcop Summary: DCOP Bindings for Perl -Group: Development/Libraries/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} -%description -n trinity-perl-dcop +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 trinity-perl-dcop +%files -n perl-dcop %defattr(-,root,root,-) %{perl_vendorarch}/auto/DCOP/ %{perl_vendorarch}/DCOP.pm @@ -607,13 +604,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE ########## -%package -n trinity-python-dcop +%package -n python-dcop Summary: DCOP bindings for Python -Group: Environment/Libraries +Group: System/Libraries Requires: python -#Provides: %{name}-dcoppython = %{version}-%{release} -%description -n trinity-python-dcop +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 @@ -621,7 +620,7 @@ communicating with running TDE applications. This package is part of the official TDE bindings module. -%files -n trinity-python-dcop +%files -n python-dcop %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so @@ -631,7 +630,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libkjsembed1 Summary: Embedded JavaScript library -Group: Environment/Libraries +Group: System/Libraries %description -n trinity-libkjsembed1 This package contains the shared libraries necessary to run programs @@ -685,7 +684,7 @@ update-desktop-database >& /dev/null ||: %package -n trinity-libkjsembed-devel Summary: Embedded JavaScript library (Development files) -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkjsembed1 = %{version}-%{release} %description -n trinity-libkjsembed-devel @@ -716,7 +715,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: Environment/Libraries +Group: System/Libraries %description -n trinity-kjscmd This package contains the kjscmd program, which is a standalone @@ -742,7 +741,7 @@ update-desktop-database >& /dev/null ||: %package -n trinity-juic Summary: The Qt Java UI Compiler -Group: Environment/Libraries +Group: Development/Languages/Java Requires: trinity-libqt3-java = %{version}-%{release} %description -n trinity-juic @@ -763,7 +762,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libkorundum0-ruby Summary: TDE bindings for Ruby [Trinity] -Group: Environment/Libraries +Group: System/Libraries Requires: trinity-libqt0-ruby = %{version}-%{release} %description -n trinity-libkorundum0-ruby @@ -782,6 +781,7 @@ This package is part of the official TDE bindings module. %{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* @@ -797,7 +797,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libqt0-ruby Summary: Qt bindings for Ruby [Trinity] -Group: Development/Languages/Other +Group: System/Libraries Requires: ruby %description -n trinity-libqt0-ruby @@ -835,10 +835,10 @@ This package is part of the official TDE bindings module. %if 0 %package -n trinity-kmozilla Summary: Kmozilla for TDE -Group: Development/Languages/Other +Group: System/Libraries %description -n trinity-kmozilla -%{summary} +This package contains the kmozilla library fro TDE. %files -n trinity-kmozilla %defattr(-,root,root,-) @@ -853,7 +853,7 @@ Group: Development/Languages/Other %package -n trinity-xpart-notepad Summary: A small XPart editor -Group: Development/Languages/Other +Group: Productivity/Scientific/Math %description -n trinity-xpart-notepad xpart_notepad is a small XPart editor. Use it to understand how to use XPart. @@ -882,7 +882,7 @@ Summary: Xparts library for GTK Group: Development/Languages/Other %description -n trinity-libgtkxparts1 -%{summary} +This package contains the xparts library for GTK. %files -n trinity-libgtkxparts1 %defattr(-,root,root,-) @@ -906,7 +906,7 @@ Obsoletes: trinity-libkdexparts1 < %{version}-%{release} Provides: trinity-libkdexparts1 = %{version}-%{release} %description -n trinity-libtdexparts -%{summary} +This package contains the xparts library for TDE. %files -n trinity-libtdexparts %defattr(-,root,root,-) @@ -930,7 +930,7 @@ Requires: trinity-libgtkxparts1 = %{version}-%{release} Requires: trinity-libtdexparts = %{version}-%{release} %description -n trinity-libxparts-devel -%{summary} +This package contains the development files for Xparts library. %files -n trinity-libxparts-devel %defattr(-,root,root,-) @@ -973,10 +973,10 @@ This package is part of the official TDE bindings module. %package -n trinity-libdcop-c Summary: DCOP bindings for C [Trinity] -Group: Development/Languages/Other +Group: System/Libraries %description -n trinity-libdcop-c -%{summary} +This package contains the DCOP bindings for C. %files -n trinity-libdcop-c %defattr(-,root,root,-) @@ -992,11 +992,11 @@ Group: Development/Languages/Other %package -n trinity-libdcop-c-devel Summary: DCOP bindings for C, development files [Trinity] -Group: Development/Languages/Other +Group: Development/Languages/C and C++ Requires: trinity-libdcop-c = %{version}-%{release} %description -n trinity-libdcop-c-devel -%{summary} +This package contains the development files for DCOP bindings for C. %files -n trinity-libdcop-c-devel %defattr(-,root,root,-) @@ -1033,9 +1033,10 @@ Requires: trinity-libqt3-jni-devel = %{version}-%{release} Requires: trinity-libtrinity-jni-devel = %{version}-%{release} %description devel -Development files for the TDE bindings. +This package contains the development files for the TDE bindings. %files devel +%defattr(-,root,root,-) ########## @@ -1047,10 +1048,7 @@ Development files for the TDE bindings. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .rubypath -%patch2 -p1 -b .ruby2 -%patch3 -p1 -b .automake113 -%patch4 -p1 -b .dcopjavaldflags +%{?tde_patch:%patch1 -p1} %if "%{?perl_vendorarch}" == "" exit 1 @@ -1066,7 +1064,7 @@ exit 1 -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -1157,21 +1155,21 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ # 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 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common -%__install qtjava/designer/juic/common/*.xsl %{?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 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java -%__install qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java -%__install qtjava/designer/juic/juic.xsl %{?buildroot}%{tde_datadir}/juic +%__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 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install kjsembed/plugins/customqobject_plugin.desktop %{?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 @@ -1195,8 +1193,3 @@ fi %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc b/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec index e31a8b741..94434b8ed 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeedu (version R14.0.0) +# spec file for package tdeedu (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -35,17 +38,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Educational/Edutainment applications Group: System/GUI/Other Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -61,6 +59,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -77,12 +76,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +BuildRequires: gcc-c++ +BuildRequires: fdupes + # PYTHON support BuildRequires: python-devel BuildRequires: python -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: fdupes # BOOST support BuildRequires: boost-devel @@ -94,6 +93,15 @@ BuildRequires: ocaml(compiler) BuildRequires: ocaml %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 +%define with_kig 0 +%else +%define with_kig 1 +%endif +%endif + Obsoletes: trinity-kdeedu < %{version}-%{release} Provides: trinity-kdeedu = %{version}-%{release} Obsoletes: trinity-kdeedu-libs < %{version}-%{release} @@ -163,7 +171,7 @@ Group: System/GUI/Other %description data This package contains shared data necessary for running the -educational applications provided with KDE (the K Desktop +educational applications provided with TDE (the Trinity Desktop Environment). This package is part of Trinity, as a component of the TDE education module. @@ -205,20 +213,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -255,20 +249,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -277,7 +257,7 @@ Group: System/GUI/Other %description -n trinity-kalzium-data This package contains architecture-independent data files for -Kalzium, the KDE periodic table application. This includes pictures +Kalzium, the TDE periodic table application. This includes pictures of various chemical equipment and of samples of several elements, in addition to the actual chemical data. @@ -321,20 +301,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -360,20 +326,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -403,20 +355,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -443,20 +381,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -465,7 +389,7 @@ Group: System/GUI/Other %description -n trinity-kgeography-data This package contains architecture-independent data files for -KGeography, the geography learning tool for KDE. This includes map +KGeography, the geography learning tool for TDE. This includes map and flag images. See the kgeography package for further information. @@ -498,7 +422,7 @@ 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_confdir}/khangmanrc %{tde_bindir}/khangman %{tde_tdeappdir}/khangman.desktop %{tde_datadir}/apps/khangman/ @@ -507,24 +431,10 @@ This package is part of Trinity, as a component of the TDE education module. %{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 +Summary: Interactive geometry program for TDE Group: System/GUI/Other Requires: trinity-tdeedu-data = %{version}-%{release} @@ -550,8 +460,8 @@ 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_confdir}/magic/cabri.magic +%{tde_confdir}/magic/drgeo.magic %{tde_bindir}/kig %{tde_bindir}/pykig.py* %{tde_tdelibdir}/tdefile_drgeo.la @@ -561,7 +471,7 @@ This package is part of Trinity, as a component of the TDE education module. %{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} +%if 0%{?with_kig} %{tde_datadir}/apps/katepart/syntax/python-kig.xml %endif %{tde_datadir}/apps/kig/ @@ -578,20 +488,8 @@ 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/ - -%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 || : +%{tde_confdir}/magic/cabri.magic.mgc +%{tde_confdir}/magic/drgeo.magic.mgc ########## @@ -602,7 +500,7 @@ 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 +Kiten is a Japanese reference and study tool for TDE. 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 @@ -619,20 +517,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -667,20 +551,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -702,7 +572,7 @@ 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_confdir}/klettresrc %{tde_bindir}/klettres %{tde_tdeappdir}/klettres.desktop %{tde_datadir}/config.kcfg/klettres.kcfg @@ -710,20 +580,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -732,7 +588,7 @@ Group: System/GUI/Other %description -n trinity-klettres-data This package contains architecture-independent data files for -KLettres, the foreign alphabet tutor for KDE. This includes sound +KLettres, the foreign alphabet tutor for TDE. This includes sound files and graphics. See the klettres package for further information. @@ -751,7 +607,7 @@ Group: System/GUI/Other Requires: trinity-tdeedu-data = %{version}-%{release} %description -n trinity-kmplot -KmPlot is a mathematical function plotter for KDE. It has a powerful +KmPlot is a mathematical function plotter for TDE. It has a powerful built-in parser. You can plot different functions simultaneously and combine them to build new functions. @@ -780,20 +636,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -820,20 +662,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -844,7 +672,7 @@ 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 +KStars is a graphical desktop planetarium for TDE. 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 @@ -860,7 +688,7 @@ 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_confdir}/kstarsrc %{tde_bindir}/kstars %{tde_tdeappdir}/kstars.desktop %{tde_datadir}/config.kcfg/kstars.kcfg @@ -868,20 +696,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -890,7 +704,7 @@ Group: System/GUI/Other %description -n trinity-kstars-data This package contains architecture-independent data files for KStars, -the graphical desktop planetarium for KDE. This includes star +the graphical desktop planetarium for TDE. This includes star catalogues and astronomical images. See the kstars package for further information. @@ -930,20 +744,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -981,20 +781,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1024,20 +810,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1067,7 +839,7 @@ 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_confdir}/kvoctrainrc %{tde_bindir}/kvoctrain %{tde_bindir}/spotlight2kvtml %{tde_libdir}/libkvoctraincore.so.* @@ -1080,22 +852,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1108,7 +864,7 @@ 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 +kvtml files used by other TDE 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). @@ -1116,7 +872,7 @@ 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_confdir}/kwordquizrc %{tde_bindir}/kwordquiz %{tde_tdeappdir}/kwordquiz.desktop %{tde_datadir}/apps/kwordquiz/ @@ -1128,20 +884,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1149,7 +891,7 @@ Summary: Library for use with Trinity educational apps Group: System/GUI/Other %description -n trinity-libtdeedu3 -The KDE-based library libtdeedu is used with educational +The TDE-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). @@ -1162,12 +904,6 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_libdir}/libtdeeduplot.so.* %{tde_libdir}/libtdeeduui.so.* -%post -n trinity-libtdeedu3 -/sbin/ldconfig || : - -%postun -n trinity-libtdeedu3 -/sbin/ldconfig || : - ########## %package -n trinity-libtdeedu-devel @@ -1176,7 +912,7 @@ Group: Development/Libraries/Other Requires: trinity-libtdeedu3 = %{version}-%{release} %description -n trinity-libtdeedu-devel -The KDE-based library libtdeedu is used with educational +The TDE-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). @@ -1196,13 +932,6 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_libdir}/libtdeeduplot.la %{tde_libdir}/libtdeeduplot.so -%post -n trinity-libtdeedu-devel -/sbin/ldconfig || : - -%postun -n trinity-libtdeedu-devel -/sbin/ldconfig || : - - ########## %package -n trinity-libkiten1 @@ -1211,7 +940,7 @@ Group: System/GUI/Other #Requires: kanjidic %description -n trinity-libkiten1 -Kiten is a Japanese reference/study tool for KDE. The library +Kiten is a Japanese reference/study tool for TDE. The library libkiten contains portions of Kiten that may be useful for other applications. These portions include dictionary, character lookup and widget classes. @@ -1234,20 +963,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1257,7 +972,7 @@ 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 +Kiten is a Japanese reference/study tool for TDE. The library libkiten contains portions of Kiten that may be useful for other applications. These portions include dictionary, character lookup and widget classes. @@ -1273,12 +988,6 @@ This package is part of Trinity, as a component of the TDE education module. %{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 @@ -1341,12 +1050,6 @@ This package contains the development files for tdeedu. %{tde_libdir}/libkvoctraincore.la %{tde_libdir}/libkvoctraincore.so -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -1359,14 +1062,20 @@ 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||" +%endif + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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}" # Specific path for RHEL4 if [ -d "/usr/X11R6" ]; then @@ -1391,7 +1100,7 @@ fi --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?with_kig} --enable-kig-python-scripting \ %else --disable-kig-python-scripting \ @@ -1441,5 +1150,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec index 3c9a88fce..336316c10 100644 --- a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec +++ b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeedu Summary: Educational/Edutainment applications Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2 Group: Amusements/Games @@ -1314,7 +1309,7 @@ Provides: trinity-kdeedu-devel = %{version}-%{release} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -1370,8 +1365,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc b/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec index 3f721ce66..993f41a18 100644 --- a/redhat/main/tdegames/tdegames-14.0.0.spec +++ b/redhat/main/tdegames/tdegames-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdegames (version R14.0.0) +# spec file for package tdegames (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdegames %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -Name: trinity-tdegames +Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Games Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -60,18 +58,38 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc 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: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: libtool +# 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 + +# OPENSSL support +BuildRequires: openssl-devel + +# ACL support +BuildRequires: libacl-devel + +# ATTR support +BuildRequires: libattr-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -82,6 +100,9 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# GLIB2 support +BuildRequires: glib2-devel + Obsoletes: trinity-kdegames < %{version}-%{release} Provides: trinity-kdegames = %{version}-%{release} Obsoletes: trinity-kdegames-libs < %{version}-%{release} @@ -152,6 +173,7 @@ TDE desktop. %files devel %defattr(-,root,root,-) +%{tde_datadir}/cmake/libtdegames.cmake ########## @@ -176,20 +198,6 @@ This package is part of TDE, and a component of the TDE games module. %{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 @@ -254,22 +262,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -294,12 +286,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -325,20 +311,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -361,20 +333,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -399,20 +357,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -436,20 +380,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -474,20 +404,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -522,20 +438,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -562,20 +464,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -599,20 +487,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -645,20 +519,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -684,20 +544,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -719,20 +565,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -763,20 +595,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -799,20 +617,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -839,20 +643,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -875,20 +665,6 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/knetwalk.desktop %{tde_tdedocdir}/HTML/en/knetwalk/ -%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 @@ -903,7 +679,7 @@ 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_confdir}/magic/kolf.magic %{tde_datadir}/apps/kolf/ %{tde_bindir}/kolf %{tde_tdeappdir}/kolf.desktop @@ -917,22 +693,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/ - -%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 || : +%{tde_confdir}/magic/kolf.magic.mgc ########## @@ -953,12 +714,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -980,20 +735,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1014,20 +755,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1048,20 +775,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1091,20 +804,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1127,20 +826,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1164,20 +849,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1205,20 +876,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1240,20 +897,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1275,20 +918,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1324,20 +953,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1363,20 +978,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1398,20 +999,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1446,20 +1033,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1490,20 +1063,6 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/twin4.desktop %{tde_tdedocdir}/HTML/en/twin4/ -%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 @@ -1531,20 +1090,6 @@ This package is part of Trinity, and a component of the TDE games module. %{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 @@ -1557,52 +1102,51 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export TDEDIR="%{tde_prefix}" +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 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --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_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -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} \ \ - --disable-setgid - -# WTF hack for RHEL4 -%if 0%{?rhel} == 4 -mkdir atlantik/libatlantic/.libs -ln -s . atlantik/libatlantic/.libs/.libs -%endif + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="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} @@ -1649,5 +1193,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec index a362c1407..0b457e10a 100644 --- a/redhat/main/tdegames/tdegames-3.5.13.2.spec +++ b/redhat/main/tdegames/tdegames-3.5.13.2.spec @@ -1,50 +1,81 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} - -Name: trinity-tdegames +Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Games Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} +Group: System/GUI/Other +URL: http://www.trinitydesktop.org/ -License: GPLv2 -Group: Amusements/Games +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#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 -BuildRequires: qt3-devel >= 3.3.8.d -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} +# 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} @@ -99,8 +130,7 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling. %package devel Summary: Development files for %{name} -Group: Development/Libraries -License: LGPLv2 +Group: Amusements/Games/Other Requires: %{name} = %{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} @@ -112,8 +142,6 @@ Obsoletes: trinity-kdegames-devel < %{version}-%{release} Provides: trinity-kdegames-devel = %{version}-%{release} %description devel -%{summary}. - Install %{name}-devel if you wish to develop or compile games for the TDE desktop. @@ -124,7 +152,7 @@ TDE desktop. %package -n trinity-libtdegames1 Summary: Trinity games library and common files -Group: Amusements/Games +Group: Amusements/Games/Other %description -n trinity-libtdegames1 This library provides a common infrastructure for several of the @@ -137,10 +165,11 @@ 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 -#%{tde_tdedocdir}/HTML/en/%{name}-%{version}-apidocs/ %post -n trinity-libtdegames1 for f in crystalsvg ; do @@ -160,7 +189,7 @@ done %package -n trinity-libtdegames-devel Summary: Trinity games library headers -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libtdegames1 = %{version}-%{release} %description -n trinity-libtdegames-devel @@ -180,7 +209,7 @@ This package is part of Trinity, and a component of the TDE games module. %package card-data Summary: Card decks for Trinity games -Group: Amusements/Games +Group: Amusements/Games/Other %description card-data Several different collections of card images for use by TDE games. @@ -189,13 +218,13 @@ This package is part of Trinity, and a component of the TDE games module. %files card-data %defattr(-,root,root,-) -%{tde_datadir}/apps/carddecks/* +%{tde_datadir}/apps/carddecks/ ########## %package -n trinity-atlantik Summary: TDE client for Monopoly-like network games -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-atlantik This is a TDE client for playing Monopoly-like boardgames on the @@ -240,7 +269,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-atlantik-devel Summary: Development files for Atlantik -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-atlantik = %{version}-%{release} %description -n trinity-atlantik-devel @@ -270,7 +299,7 @@ This package is part of Trinity, and a component of the TDE games module. %package -n trinity-kasteroids Summary: Asteroids for Trinity -Group: Amusements/Games +Group: Amusements/Games/Action/Arcade %description -n trinity-kasteroids You know this game. It is based on Warwick Allison's QwSpriteField @@ -309,7 +338,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-katomic Summary: Atomic Entertainment game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-katomic This is a puzzle game, in which the object is to assemble a molecule @@ -345,7 +374,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kbackgammon Summary: A Backgammon game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kbackgammon KBackgammon is a backgammon program for Trinity. It is based on the @@ -383,7 +412,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kbattleship Summary: Battleship game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kbattleship This is an implementation of the Battleship game. Each player tries @@ -420,7 +449,7 @@ 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 +Group: Amusements/Games/Board/Other %description -n trinity-kblackbox KBlackBox is a game of hide and seek played on an grid of boxes. Your @@ -458,7 +487,7 @@ 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 +Group: Amusements/Games/Action/Arcade %description -n trinity-kbounce This is a clone of the popular Jezzball game originally created by @@ -506,7 +535,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kenolaba Summary: Enolaba board game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kenolaba kenolaba is a simple board strategy game that is played by two @@ -546,7 +575,7 @@ 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 +Group: Amusements/Games/Action/Arcade %description -n trinity-kfouleggs KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced @@ -583,7 +612,7 @@ 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 +Group: Amusements/Games/Action/Arcade %description -n trinity-kgoldrunner KGoldrunner, a game of action and puzzle solving. Run through the @@ -629,7 +658,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kjumpingcube Summary: Tactical one or two player game -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-kjumpingcube KJumpingCube is a simple tactical game. You can play it against the @@ -668,7 +697,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-klickety Summary: A Clickomania-like game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-klickety Klickety is an adaptation of the (perhaps) well-known Clickomania @@ -682,8 +711,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_tdeappdir}/klickety.desktop %{tde_datadir}/icons/hicolor/*/apps/klickety.png %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png -%{tde_datadir}/apps/klickety/klicketyui.rc -%{tde_datadir}/apps/klickety/eventsrc +%{tde_datadir}/apps/klickety/ %{tde_tdedocdir}/HTML/en/klickety/ %post -n trinity-klickety @@ -704,7 +732,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-klines Summary: Color lines for Trinity -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-klines KLines is a simple game. It is played by one player, so there is only @@ -747,8 +775,8 @@ 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 +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 @@ -784,7 +812,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kmines Summary: Minesweeper for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kmines KMines is the classic Minesweeper game. You must uncover all the @@ -824,7 +852,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-knetwalk Summary: A game for system administrators -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-knetwalk This game presents the player with a rectangular field consisting of @@ -859,7 +887,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kolf Summary: Minigolf game for TDE -Group: Amusements/Games +Group: Amusements/Games/Action/Arcade %description -n trinity-kolf This is a minigolf game for TDE that allows you to go through different @@ -904,7 +932,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kolf-devel Summary: Development files for Kolf -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kolf = %{version}-%{release} %description -n trinity-kolf-devel @@ -929,7 +957,7 @@ This package is part of Trinity, and a component of the TDE games module. %package -n trinity-konquest Summary: TDE based GNU-Lactic Konquest game -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-konquest This the TDE version of Gnu-Lactic Konquest, a multi-player strategy @@ -964,7 +992,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kpat Summary: Trinity solitaire patience game -Group: Amusements/Games +Group: Amusements/Games/Board/Card %description -n trinity-kpat KPatience is a collection of 14 card games. All the games are single @@ -998,7 +1026,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kpoker Summary: Trinity based Poker clone -Group: Amusements/Games +Group: Amusements/Games/Board/Card %description -n trinity-kpoker KPoker is a TDE compliant clone of those highly addictive pocket @@ -1032,7 +1060,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kreversi Summary: Reversi for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kreversi Reversi is a simple strategy game that is played by two @@ -1075,7 +1103,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ksame Summary: SameGame for Trinity -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-ksame KSame is a simple game. It's played by one player, so there is only @@ -1089,7 +1117,7 @@ This package is part of Trinity, and a component of the TDE games module. %defattr(-,root,root,-) %{tde_bindir}/ksame %{tde_datadir}/icons/hicolor/*/apps/ksame.png -%{tde_datadir}/apps/ksame/* +%{tde_datadir}/apps/ksame/ %{tde_tdeappdir}/ksame.desktop %{tde_tdedocdir}/HTML/en/ksame/ @@ -1111,7 +1139,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kshisen Summary: Shisen-Sho for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-kshisen KShisen-Sho is a single-player-game similar to Mahjongg and uses the @@ -1148,7 +1176,7 @@ 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 +Group: Amusements/Games/Board/Other %description -n trinity-ksirtet This program is a clone of the well known game Tetris. You must fit @@ -1189,7 +1217,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ksmiletris Summary: Tetris like game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Action/Arcade %description -n trinity-ksmiletris This is a game with falling blocks composed of different types of @@ -1224,7 +1252,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ksnake Summary: Snake Race for Trinity -Group: Amusements/Games +Group: Amusements/Games/Action/Arcade %description -n trinity-ksnake Snake Race is a game of speed and agility. You are a hungry snake and @@ -1259,7 +1287,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ksokoban Summary: Sokoban game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Strategy/Other %description -n trinity-ksokoban The first sokoban game was created in 1982 by Hiroyuki Imabayashi at @@ -1308,7 +1336,7 @@ 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 +Group: Amusements/Games/Action/Arcade %description -n trinity-kspaceduel KSpaceduel is an space arcade game for two players. @@ -1347,7 +1375,7 @@ 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 +Group: Amusements/Games/Action/Arcade %description -n trinity-ktron The object of the game is to avoid running into walls, your own tail, @@ -1382,7 +1410,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-ktuberling Summary: Potato Guy for Trinity -Group: Amusements/Games +Group: Amusements/Games/Action/Arcade %description -n trinity-ktuberling KTuberling is a game intended for small children. Of course, it may @@ -1430,7 +1458,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-twin4 Summary: Connect Four clone for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Other %description -n trinity-twin4 Four wins is a game for two players. Each player is represented by a @@ -1474,7 +1502,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-lskat Summary: Lieutnant Skat card game for Trinity -Group: Amusements/Games +Group: Amusements/Games/Board/Card %description -n trinity-lskat Lieutnant Skat (from German Offiziersskat) is a card game for two @@ -1513,7 +1541,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1524,12 +1552,13 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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 +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" # Do not build against any "/usr" installed KDE @@ -1537,7 +1566,7 @@ 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi %configure \ @@ -1571,17 +1600,48 @@ 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 -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/main/tdegames/trinity-tdegames-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdegames/trinity-tdegames-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec index c63d352a4..578aa0d02 100644 --- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdegraphics (version R14.0.0) +# spec file for package tdegraphics (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,15 +12,18 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -30,15 +33,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Desktop Environment - Graphics Applications Group: Productivity/Graphics/Viewers URL: http://www.trinitydesktop.org/ @@ -56,6 +54,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -98,8 +97,11 @@ BuildRequires: libtiff-devel # PCRE support BuildRequires: pcre-devel +# ACL support +BuildRequires: libacl-devel + # GIF support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?fedora} >= 28 BuildRequires: giflib-devel %else BuildRequires: libungif-devel @@ -193,10 +195,15 @@ BuildRequires: libdrm-devel # OPENEXR support BuildRequires: OpenEXR-devel -# poppler +# POPPLER support +%define with_pdf 1 +%if 0%{?with_pdf} %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libpoppler-devel >= 0.12 +%else BuildRequires: poppler-devel >= 0.12 -#BuildRequires: poppler-qt-devel >= 0.12 +%endif %endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}poppler-devel @@ -204,11 +211,11 @@ BuildRequires: %{_lib}poppler-devel %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 %endif # LCMS support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel %else BuildRequires: lcms-devel @@ -217,6 +224,9 @@ BuildRequires: lcms-devel # FRIBIDI support BuildRequires: fribidi-devel +# OPENSSL support +BuildRequires: openssl-devel + # kamera %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} %define build_kamera 1 @@ -258,7 +268,9 @@ Requires: trinity-ksvg = %{version}-%{release} Requires: trinity-kview = %{version}-%{release} Requires: trinity-kviewshell = %{version}-%{release} Requires: trinity-libkscan = %{version}-%{release} +%if 0%{?with_pdf} Requires: trinity-libpoppler-tqt = %{version}-%{release} +%endif %description Graphics applications for the Trinity Desktop Environment, including @@ -294,20 +306,6 @@ Group: Hardware/Camera 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 @@ -346,20 +344,6 @@ picker. %{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 @@ -390,8 +374,10 @@ tags, etc. all from within the file manager). %{tde_tdelibdir}/tdefile_jpeg.so %{tde_tdelibdir}/tdefile_pcx.la %{tde_tdelibdir}/tdefile_pcx.so +%if 0%{?with_pdf} %{tde_tdelibdir}/tdefile_pdf.la %{tde_tdelibdir}/tdefile_pdf.so +%endif %{tde_tdelibdir}/tdefile_png.la %{tde_tdelibdir}/tdefile_png.so %{tde_tdelibdir}/tdefile_pnm.la @@ -419,7 +405,9 @@ tags, etc. all from within the file manager). %{tde_datadir}/services/tdefile_ico.desktop %{tde_datadir}/services/tdefile_jpeg.desktop %{tde_datadir}/services/tdefile_pcx.desktop +%if 0%{?with_pdf} %{tde_datadir}/services/tdefile_pdf.desktop +%endif %{tde_datadir}/services/tdefile_png.desktop %{tde_datadir}/services/tdefile_pnm.desktop %{tde_datadir}/services/tdefile_ps.desktop @@ -452,20 +440,6 @@ This program and KPart allow the user to display *.DVI files from TeX. %{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 @@ -485,20 +459,6 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz %{tde_tdedocdir}/HTML/en/kfax/ -%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 @@ -525,22 +485,6 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/services/kfaxmultipage_tiff.desktop %{tde_tdedocdir}/HTML/en/kfaxview/ -%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 @@ -564,20 +508,6 @@ Homepage: http://kgamma.berlios.de/index2.php %{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 @@ -608,22 +538,6 @@ online. %{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 @@ -644,20 +558,6 @@ TDEIconedit allows you easily to create and edit icons. %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png %{tde_tdedocdir}/HTML/en/tdeiconedit/ -%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} @@ -693,14 +593,6 @@ MRML server. %{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 ########## @@ -733,20 +625,6 @@ Homepage: http://kolourpaint.sourceforge.net %{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 @@ -773,16 +651,10 @@ Homepage: http://kooka.kde.org/ %{tde_bindir}/kooka %{tde_tdeappdir}/kooka.desktop %{tde_datadir}/apps/kooka/ -%{tde_datadir}/config/kookarc +%{tde_confdir}/kookarc %{tde_datadir}/icons/hicolor/*/apps/kooka.png %{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 @@ -808,20 +680,6 @@ application. %{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 @@ -855,22 +713,6 @@ Homepage: http://www.kpovmodeler.org %{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 @@ -889,20 +731,6 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE. %{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 @@ -922,20 +750,6 @@ The images can then be saved in a variety of formats. %{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 @@ -967,12 +781,6 @@ application. %{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 @@ -1029,22 +837,6 @@ as well. %{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 @@ -1081,20 +873,6 @@ DjVu images. %{tde_datadir}/services/djvumultipage.desktop %{tde_datadir}/servicetypes/tdemultipage.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 @@ -1115,20 +893,6 @@ It provides an easy-to-use library, which allows you to access your scanner %{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 @@ -1144,14 +908,9 @@ This package contains development files for Trinity's scanner library. %{tde_libdir}/libkscan.la %{tde_libdir}/libkscan.so -%post -n trinity-libkscan-devel -/sbin/ldconfig || : - -%postun -n trinity-libkscan-devel -/sbin/ldconfig || : - ########## +%if 0%{?with_pdf} %package -n trinity-libpoppler-tqt Summary: TQt support for Poppler Group: Productivity/Graphics/Viewers @@ -1167,15 +926,11 @@ 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 || : +%endif ########## +%if 0%{?with_pdf} %package -n trinity-libpoppler-tqt-devel Summary: Development files for TQt support for Poppler Group: Development/Libraries/Other @@ -1197,12 +952,7 @@ This package contains the development files needed to compile applications again %{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 || : +%endif ########## @@ -1215,7 +965,9 @@ Provides: trinity-kdegraphics-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: trinity-libkscan-devel = %{version}-%{release} +%if 0%{?with_pdf} Requires: trinity-libpoppler-tqt-devel = %{version}-%{release} +%endif %description devel This package contains the development files needed to compile @@ -1251,12 +1003,6 @@ applications against tdegraphics libraries. # cmake %{tde_datadir}/cmake/* -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -1275,6 +1021,15 @@ applications against tdegraphics libraries. # Fix applications icons %__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|" +# Fix FTBFS in RHEL 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%__sed -i "kpdf/xpdf/aconf.h" \ + -e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|" +%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \ + -e "/link_directories/ s|$|\n \${POPPLER_LIBRARY_DIRS}|" \ + -e "/{POPPLER_INCLUDE_DIRS/ s|$|\n \${POPPLER_INCLUDE_DIRS}/..|" +%endif + %build unset QTDIR QTINC QTLIB @@ -1304,6 +1059,7 @@ fi \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -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} \ @@ -1313,7 +1069,7 @@ fi %{?with_paper:-DWITH_LIBPAPER=ON} \ -DWITH_TIFF=ON \ -DWITH_OPENEXR=ON \ - -DWITH_PDF=ON \ + -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \ -DBUILD_ALL=ON \ -DBUILD_KUICKSHOW=OFF \ %{!?build_kmrml:-DBUILD_KMRML=OFF} \ @@ -1362,5 +1118,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec index f75915f34..a625a2b6a 100644 --- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec +++ b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdegraphics Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPL Summary: Trinity Desktop Environment - Graphics Applications @@ -1335,11 +1330,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 4071cb33c..2a7aa0446 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdelibs (version R14.0.0) +# spec file for package tdelibs (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,15 +37,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -60,7 +58,10 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: trinity-tdelibs-rpmlintrc +Source1: %{name}-rpmlintrc + +Patch0: tdelibs-14.0.1.patch +Patch1: tdelibs-14.1.0.patch Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} @@ -83,7 +84,10 @@ BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-filesystem >= %{tde_version} +%if 0%{?mgaversion} >= 6 +%else Requires: fileshareset >= 2.0 +%endif BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ @@ -121,6 +125,9 @@ BuildRequires: libtiff-devel # OPENSSL support BuildRequires: openssl-devel +# ACL support +BuildRequires: libacl-devel + # GLIB2 support BuildRequires: glib2-devel @@ -160,7 +167,10 @@ BuildRequires: bzip2-devel %endif # UTEMPTER support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}utempter-devel +%endif +%if 0%{?rhel} >=5 || 0%{?fedora} BuildRequires: libutempter-devel %endif %if 0%{?rhel} == 4 @@ -171,13 +181,13 @@ BuildRequires: utempter-devel %endif # HSPELL support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_hspell 1 BuildRequires: hspell-devel %endif # JASPER support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_jasper 1 %if 0%{?suse_version} BuildRequires: libjasper-devel @@ -205,9 +215,12 @@ Requires: avahi %endif # OPENEXR support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 BuildRequires: OpenEXR-devel +%if 0%{?pclinuxos} +BuildRequires: libpthread-stubs +%endif %endif # LIBTOOL @@ -253,15 +266,25 @@ BuildRequires: xz-devel %endif # Certificates support -%if 0%{?fedora} == 18 || 0%{?fedora} == 19 -%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: ca-certificates Requires: ca-certificates +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6 +%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +%endif +%if 0%{?fedora} == 18 || 0%{?fedora} == 19 +%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20 +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} +Requires: rootcerts +%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +%else %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt Requires: openssl %endif +%endif %if 0%{?rhel} == 5 %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt Requires: openssl @@ -298,16 +321,15 @@ Requires: %{cacert} %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}} ### New features in TDE R14 # LIBMAGIC support -%if 0%{?rhel} == 5 -BuildRequires: file -%else BuildRequires: file-devel -%endif # NETWORKMANAGER support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} @@ -336,10 +358,12 @@ BuildRequires: libudev-devel # UDISKS support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 +%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks %endif +%endif # PMOUNT support #Requires: pmount @@ -350,8 +374,12 @@ Requires: udisks %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libudisks2-devel %else +%if 0%{?suse_version} >= 1550 +BuildRequires: libudisks2-0-devel +%else BuildRequires: udisks2-devel %endif +%endif Requires: udisks2 %endif @@ -372,6 +400,43 @@ Requires: upower %define with_systemd 1 %endif +# PCSCLITE support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}pcsclite-devel +%else +BuildRequires: pcsc-lite-devel +%endif + +# PKCS11 support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}pkcs11-helper-devel +%else +BuildRequires: pkcs11-helper-devel +%endif + +# OPENSC support +BuildRequires: opensc + +# CRYPTSETUP support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}cryptsetup-devel +%endif +%if 0%{?suse_version} +BuildRequires: libcryptsetup-devel +%endif +%if 0%{?rhel} >= 7 || 0%{?fedora} +BuildRequires: cryptsetup-devel +%endif +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +BuildRequires: cryptsetup-luks-devel +%endif + +# ELFICON support +%if 0 +%define with_elficon 1 +BuildRequires: libr-devel >= 0.6.0 +%endif + %description Libraries for the Trinity Desktop Environment: @@ -452,7 +517,6 @@ kimgio (image manipulation). %{tde_datadir}/applnk/tdeio_iso.desktop %{tde_datadir}/apps/* %exclude %{tde_datadir}/apps/ksgmltools2/ -%{tde_datadir}/config/* %{tde_datadir}/emoticons/* %{tde_datadir}/icons/crystalsvg/ %{tde_datadir}/icons/default.tde @@ -464,6 +528,9 @@ kimgio (image manipulation). %{tde_tdedocdir}/HTML/en/common/* %{tde_tdedocdir}/HTML/en/tdespell/ +# Global Trinity configuration +%config %{tde_confdir} + # Some setuid binaries need special care %if 0%{?suse_version} %verify(not mode) %{tde_bindir}/kgrantpty @@ -492,8 +559,6 @@ if [ -d "%{tde_datadir}/locale/all_languages" ]; then fi %post -/sbin/ldconfig || : - %if 0%{?suse_version} # Sets permissions on setuid files (openSUSE specific) %set_permissions %{tde_bindir}/kgrantpty @@ -501,9 +566,6 @@ fi %set_permissions %{tde_bindir}/start_tdeinit %endif -%postun -/sbin/ldconfig || : - ########## %package devel @@ -542,12 +604,6 @@ applications for TDE. %{tde_datadir}/cmake/tdelibs.cmake %{tde_libdir}/pkgconfig/tdelibs.pc -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -558,6 +614,15 @@ 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 +%__sed -i "tdecore/kinstance.h" \ + -i "tdecore/tdeglobal.h" \ + -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d" +%endif %build @@ -588,6 +653,7 @@ fi \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DDOC_INSTALL_DIR="%{tde_docdir}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ @@ -606,8 +672,8 @@ fi %{?!with_jasper:-DWITH_JASPER=OFF} \ %{?!with_openexr:-DWITH_OPENEXR=OFF} \ -DWITH_UTEMPTER=ON \ - %{?!with_elficon:-DWITH_ELFICON=OFF} \ %{?!with_avahi:-DWITH_AVAHI=OFF} \ + %{?!with_elficon:-DWITH_ELFICON=OFF} \ %{?!with_pcre:-DWITH_PCRE=OFF} \ %{?!with_inotify:-DWITH_INOTIFY=OFF} \ %{?!with_gamin:-DWITH_GAMIN=OFF} \ @@ -619,10 +685,14 @@ fi %{?!with_upower:-DWITH_UPOWER=OFF} \ %{?!with_udisks:-DWITH_UDISKS=OFF} \ %{?!with_udisks2:-DWITH_UDISKS2=OFF} \ + -DWITH_UDEVIL=OFF \ -DWITH_CONSOLEKIT=ON \ %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \ -DWITH_SUDO_TDESU_BACKEND=OFF \ -DWITH_OLD_XDG_STD=OFF \ + -DWITH_PCSC=ON \ + -DWITH_PKCS=ON \ + -DWITH_CRYPTSETUP=ON \ %{?!with_lzma:-DWITH_LZMA=OFF} \ -DWITH_LIBBFD=OFF \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \ @@ -679,5 +749,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch new file mode 100644 index 000000000..ab309f841 --- /dev/null +++ b/redhat/main/tdelibs/tdelibs-14.0.1.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 000000000..c4812b447 --- /dev/null +++ b/redhat/main/tdelibs/tdelibs-14.1.0.patch @@ -0,0 +1,13 @@ +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 index 61cbf5344..7775f4908 100644 --- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec +++ b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -29,20 +29,18 @@ %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 -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TDE Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -62,6 +60,8 @@ 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} @@ -95,6 +95,11 @@ BuildRequires: fdupes 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 @@ -166,21 +171,18 @@ BuildRequires: utempter-devel %endif # HSPELL support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_hspell 1 BuildRequires: hspell-devel %endif # JASPER support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%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%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jasper-devel -%endif -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: jasper-devel %endif %endif @@ -190,7 +192,7 @@ BuildRequires: jasper-devel %define with_avahi 1 BuildRequires: libavahi-tqt-devel >= 1:0.6.30 %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}avahi-client-devel +BuildRequires: avahi-client-devel Requires: %{_lib}avahi-client3 %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -200,7 +202,7 @@ Requires: avahi %endif # OPENEXR support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 BuildRequires: OpenEXR-devel %endif @@ -208,7 +210,7 @@ BuildRequires: OpenEXR-devel # LIBTOOL BuildRequires: libtool %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel +BuildRequires: libltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 BuildRequires: libtool-ltdl-devel @@ -240,7 +242,7 @@ Requires: xorg-x11 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} %define with_lzma 1 %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}lzma-devel +BuildRequires: liblzma-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} BuildRequires: xz-devel @@ -248,12 +250,12 @@ BuildRequires: xz-devel %endif # Certificates support -%if 0%{?rhel} >= 6 || 0%{?fedora} +%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} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20 %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt Requires: openssl %endif @@ -266,6 +268,9 @@ Requires: openssl BuildRequires: ca-certificates Requires: ca-certificates %endif +%if "%{cacert}" != "" +Requires: %{cacert} +%endif # XRANDR support # On RHEL5, xrandr library is too old. @@ -276,7 +281,7 @@ Requires: ca-certificates # XCOMPOSITE support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 -%define xcomposite_devel %{_lib}xcomposite-devel +%define xcomposite_devel libxcomposite-devel %else %define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel %endif @@ -290,10 +295,12 @@ Requires: ca-certificates %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), @@ -419,12 +426,12 @@ fi %package devel Summary: TDE Libraries (Development files) Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{tde_epoch}:%{version}-%{release} -Obsoletes: tdelibs-devel < %{version}-%{release} -Provides: tdelibs-devel = %{version}-%{release} -Obsoletes: trinity-kdelibs-devel < %{version}-%{release} -Provides: trinity-kdelibs-devel = %{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 @@ -459,7 +466,7 @@ applications for TDE. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -467,6 +474,7 @@ applications for TDE. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%{?tde_patch:%patch1 -p1} %build @@ -544,7 +552,7 @@ fi # Fix 'tderesources.desktop' (openSUSE only) %if 0%{?suse_version} -%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop +%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop %endif # Remove setuid bit on some binaries. @@ -571,16 +579,3 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4 -- Remove integrated fileshareset. -- Update dependencies. - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option -- Fix XDG menu - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc index 7df2d7387..cd73a0285 100644 --- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc +++ b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc @@ -1,3 +1,4 @@ setBadness('suse-dbus-unauthorized-service', 0) setBadness('permissions-file-setuid-bit', 0) setBadness('non-position-independent-executable', 0) +setBadness('library-without-ldconfig-postun', 0) diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec new file mode 100644 index 000000000..44fd60fab --- /dev/null +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec @@ -0,0 +1,1145 @@ +# +# 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-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec new file mode 100644 index 000000000..086f7ec9f --- /dev/null +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec @@ -0,0 +1,1158 @@ +# +# 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 +Source1: %{name}-rpmlintrc + +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: cmake +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 +%if 0%{?opensuse_bs} == 0 +%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 +%endif + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# ACL support +BuildRequires: libacl-devel + +# ATTR support +BuildRequires: libattr-devel + +%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}} + +# 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}" + +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 \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -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_ALSA=ON \ + -DWITH_ARTS_AKODE=ON \ + -DWITH_ARTS_AUDIOFILE=ON \ + -DWITH_ARTS_MPEGLIB=ON \ + -DWITH_ARTS_XINE=ON \ + -DWITH_CDPARANOIA=ON \ + -DWITH_FLAC=ON \ + -DWITH_GSTREAMER=ON \ + -DWITH_KSCD_CDDA=ON \ + -DWITH_LAME=%{?with_lame:ON}%{!?with_lame:OFF} \ + -DWITH_MUSICBRAINZ=%{?with_musicbrainz:ON}%{!?with_musicbrainz:OFF} \ + -DWITH_TAGLIB=%{?with_taglib:ON}%{!?with_taglib:OFF} \ + -DWITH_THEORA=ON \ + -DWITH_VORBIS=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build + +# 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 index c27d6ce15..90fb9141a 100644..120000 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec @@ -1,1321 +1 @@ -# -# spec file for package tdemultimedia (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 2 -%define tde_version 14.0.0 -%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 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - - -Name: trinity-%{tde_pkg} -Summary: Multimedia applications for the Trinity Desktop Environment (TDE) -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -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_mad: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 - -# 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 -%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%{?with_lame} -%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/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/ - -%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}/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 - -%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}/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/ - -%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}/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/ - -%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}/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/ - -%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_mad:%{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/tdeconf_update/kcmcddb-emailsettings.upd -%{tde_datadir}/config.kcfg/libkcddb.kcfg -%{tde_tdedocdir}/HTML/en/kcontrol/cddb/ - -%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}/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/ - -%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}/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 - -%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}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/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_includedir}/artsc:%{tde_tdeincludedir}/arts" \ - \ - --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 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 -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.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 index 21a6019f3..397314c05 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec @@ -1,5 +1,5 @@ # -# spec file for package tdemultimedia (version 3.5.13.2) +# spec file for package tdemultimedia (version 3.5.13-SRU) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -34,17 +34,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} -Group: Applications/Multimedia +Release: %{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist} +Group: Productivity/Multimedia/Sound/Utilities URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -70,21 +65,21 @@ Provides: trinity-kdemultimedia-extras = %{version}-%{release} Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release} Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} - -BuildRequires: trinity-arts-devel >= 1:1.5.10 +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} +%if 0%{?opensuse_bs} && 0%{?suse_version} # for xdg-menu script BuildRequires: brp-check-trinity %endif @@ -96,10 +91,10 @@ BuildRequires: taglib-devel # AKODE support %if 0%{?with_akode} BuildRequires: trinity-akode-devel -%{?with_mad:BuildRequires: trinity-akode-libmad} +%{?with_libmad:BuildRequires: trinity-akode-libmad} %endif -BuildRequires: desktop-file-utils +# ZLIB support BuildRequires: zlib-devel # MUSICBRAINZ support @@ -173,7 +168,7 @@ BuildRequires: libXxf86vm-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?with_xine} +%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} @@ -192,7 +187,7 @@ BuildRequires: libxine-devel # LAME support %if 0%{?opensuse_bs} == 0 -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?with_lame} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} %define with_lame 1 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -230,7 +225,7 @@ 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} -Requires: trinity-mpeglib = %{version}-%{release} +%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}} Requires: trinity-noatun = %{version}-%{release} @@ -255,7 +250,7 @@ TDE, including: %package -n trinity-artsbuilder Summary: Synthesizer designer for aRts -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Mixers Requires: trinity-kicker >= %{tde_version} %description -n trinity-artsbuilder @@ -436,7 +431,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-juk Summary: Music organizer and player for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Players %description -n trinity-juk JuK (pronounced "jook") is a jukebox and music manager for the TDE @@ -484,7 +479,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kaboodle Summary: Light, embedded media player for Trinity -Group: Applications/Multimedia +Group: System/GUI/Other %if 0%{?with_xine} Requires: trinity-libarts-xine = %{version}-%{release} @@ -524,7 +519,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kaudiocreator Summary: CD ripper and audio encoder frontend for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/CD/Grabbers Requires: %{name}-tdeio-plugins = %{version}-%{release} Requires: vorbis-tools @@ -568,7 +563,7 @@ 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: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Utilities %description kfile-plugins au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. @@ -613,7 +608,7 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. %package kappfinder-data Summary: Multimedia data for kappfinder -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Utilities Requires: trinity-kappfinder >= %{tde_version} Requires: trinity-tdebase-runtime-data-common >= %{tde_version} @@ -631,7 +626,7 @@ This package provides data on multimedia applications for kappfinder. %package tdeio-plugins Summary: Enables the browsing of audio CDs under Konqueror -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Utilities Requires: trinity-tdebase-tdeio-plugins >= %{tde_version} Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release} @@ -662,7 +657,8 @@ Konqueror and the audiocd:/ URL. %{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/audiocd.docbook +%{tde_tdedocdir}/HTML/en/kioslave/ +%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png %post tdeio-plugins /sbin/ldconfig @@ -676,7 +672,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-tdemid Summary: MIDI/karaoke player for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Midi Obsoletes: trinity-kmid < %{version}-%{release} Provides: trinity-kmid = %{version}-%{release} @@ -717,7 +713,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kmix Summary: Sound mixer applet for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Mixers Requires: trinity-kicker >= %{tde_version} %description -n trinity-kmix @@ -764,7 +760,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-krec Summary: Sound recorder utility for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/CD/Record %description -n trinity-krec This is a sound recording utility for Trinity. @@ -818,7 +814,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kscd Summary: Audio CD player for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/CD/Players %description -n trinity-kscd This is Trinity's audio CD player. @@ -855,7 +851,7 @@ 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: Environment/Libraries +Group: Productivity/Multimedia/Other %description -n trinity-libarts-akode This package contains akode plugins for aRts. @@ -873,7 +869,7 @@ This package contains akode plugins for aRts. %{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass # Requires MAD support -%{?with_mad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass} +%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass} %post -n trinity-libarts-akode /sbin/ldconfig @@ -886,7 +882,7 @@ This package contains akode plugins for aRts. %package -n trinity-libarts-audiofile Summary: Audiofile plugin for aRts -Group: Environment/Libraries +Group: Productivity/Multimedia/Other %description -n trinity-libarts-audiofile This package contains audiofile plugins for aRts. @@ -910,7 +906,7 @@ This package contains audiofile plugins for aRts. %if 0%{?with_mpeg} %package -n trinity-libarts-mpeglib Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video -Group: Environment/Libraries +Group: Productivity/Multimedia/Other %description -n trinity-libarts-mpeglib This package contains the mpeglib aRts plugin, supporting mp3 and mpeg @@ -944,7 +940,7 @@ This is the arts (TDE Sound daemon) plugin. %if 0%{?with_xine} %package -n trinity-libarts-xine Summary: ARTS plugin enabling xine support -Group: Environment/Libraries +Group: Productivity/Multimedia/Other %description -n trinity-libarts-xine This package contains aRts' xine plugin, allowing the use of the xine @@ -974,7 +970,7 @@ multimedia engine though aRts. %package -n trinity-libkcddb Summary: CDDB library for Trinity -Group: Environment/Libraries +Group: Productivity/Multimedia/Other Requires: trinity-kcontrol >= %{tde_version} %description -n trinity-libkcddb @@ -1001,10 +997,14 @@ 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: Environment/Libraries +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 @@ -1019,9 +1019,7 @@ and WAV playback %{tde_bindir}/yaf-tplay %{tde_bindir}/yaf-vorbis %{tde_bindir}/yaf-yuv -%if 0%{?with_mpeg} %{tde_libdir}/libmpeg-0.3.0.so -%endif %{tde_libdir}/libyafcore.so %{tde_libdir}/libyafxplayer.so @@ -1031,11 +1029,13 @@ and WAV playback %postun -n trinity-mpeglib /sbin/ldconfig +%endif + ########## %package -n trinity-noatun Summary: Media player for Trinity -Group: Applications/Multimedia +Group: Productivity/Multimedia/Video/Players Requires: trinity-tdebase-bin >= %{tde_version} # 20120802: Hack to avoid dependency issue on MGA2 and MDV2011 @@ -1136,7 +1136,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package devel Summary: Development files for %{name}, aRts and noatun plugins -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} @@ -1197,8 +1197,10 @@ noatun plugins. %{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 @@ -1208,7 +1210,7 @@ noatun plugins. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1225,11 +1227,11 @@ noatun plugins. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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|" +%__sed -i "kioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|" %build @@ -1263,16 +1265,19 @@ fi \ --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ \ - --with-cdparanoia \ - --with-flac \ - --with-theora \ --with-vorbis \ + --without-ossaudio \ --with-alsa \ - --with-gstreamer \ + --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_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \ + --with-gstreamer \ + --with-kscd-cdda \ + --with-theora \ + --with-flac \ %{?with_xine:--with-xine} %{!?with_xine:--without-xine} %__make %{?_smp_mflags} || %__make @@ -1285,28 +1290,30 @@ export PATH="%{tde_bindir}:${PATH}" # Disable MPEG support entirely %if 0%{?with_mpeg} == 0 - %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay - %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib* - %__rm %{?buildroot}%{tde_libdir}/libarts_splay.* - %__rm %{?buildroot}%{tde_libdir}/libmpeg* - %__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 +%__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 $RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/ +%__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 +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 tdemid AudioVideo Midi +%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 @@ -1318,8 +1325,8 @@ popd %suse_update_desktop_file audiocd %endif -# Symlinks duplicate files -%fdupes -s "%{?buildroot}%{tde_datadir}" +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" %clean @@ -1327,18 +1334,3 @@ popd %changelog -* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5 -- Mageia 3: rebuild against Xine 1.2 - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Rebuild with NDEBUG option -- Fix XDG menu - -* Mon Jun 17 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Enable "LAME" support - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc b/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec index b73791a00..28717c158 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec @@ -1,5 +1,9 @@ +%if 0%{?fedora} >= 23 +%define _hardened_ldflags %nil +%endif + # -# spec file for package tdenetwork (version R14.0.0) +# spec file for package tdenetwork (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +16,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +25,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -36,20 +43,20 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Avoids relinking, which breaks consolehelper %define dont_relink 1 +%if "%{?tde_version}" == "14.0.4" +%define with_aim 1 +%else +%define with_aim 0 +%endif Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Network Applications Group: Applications/Internet Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -196,6 +203,9 @@ BuildRequires: libv4l-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}v4l-devel %endif +%if 0%{?rhel} == 5 +BuildRequires: kernel-headers +%endif # XML support BuildRequires: libxml2-devel @@ -215,17 +225,15 @@ BuildRequires: speex-devel #{?fedora:Requires(hint): qca-tls} Requires: jasper +# ACL support +BuildRequires: libacl-devel + # 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 @@ -315,12 +323,6 @@ DCOP is the TDE interprocess communication protocol. %{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 @@ -356,12 +358,6 @@ development-related files for the TDE network module. %{tde_libdir}/librss.la %{tde_libdir}/librss.so -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - ########## %package filesharing @@ -392,18 +388,6 @@ NFS and Samba. %{tde_tdedocdir}/HTML/en/kcontrol/fileshare/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/ -%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 @@ -429,18 +413,6 @@ basic as well as advanced queries. %{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 @@ -463,12 +435,6 @@ dialog in konqueror and other file-handling applications. %{tde_tdelibdir}/tdefile_torrent.so %{tde_datadir}/services/tdefile_torrent.desktop -%post tdefile-plugins -update-desktop-database 2> /dev/null || : - -%postun tdefile-plugins -update-desktop-database 2> /dev/null || : - ########## %package -n trinity-kget @@ -506,18 +472,6 @@ applications and Netscape. %{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 @@ -549,18 +503,6 @@ good news sources which provide such files. %{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 @@ -692,13 +634,8 @@ Support for more IM protocols can be added through a plugin system. %{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz %{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng %{tde_datadir}/icons/hicolor/*/actions/newmessage.mng -%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png %{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png %{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png -%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng -%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png %{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png %{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng %{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png @@ -716,10 +653,6 @@ Support for more IM protocols can be added through a plugin system. %{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png %{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png %{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png -%{tde_datadir}/icons/hicolor/*/actions/aim_away.png -%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng -%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png -%{tde_datadir}/icons/hicolor/*/actions/aim_online.png %{tde_datadir}/icons/hicolor/*/actions/icq_away.png %{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng %{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png @@ -729,11 +662,9 @@ Support for more IM protocols can be added through a plugin system. %{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png %{tde_datadir}/icons/hicolor/*/actions/icq_offline.png %{tde_datadir}/icons/hicolor/*/actions/icq_online.png -%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png %{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png %{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 @@ -753,21 +684,20 @@ Support for more IM protocols can be added through a plugin system. %{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 +# aim support is deprecated in TDE 14.1.0 +%if 0%{?with_aim} +%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png +%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png +%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng +%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png +%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png +%{tde_datadir}/icons/hicolor/*/actions/aim_away.png +%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng +%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png +%{tde_datadir}/icons/hicolor/*/actions/aim_online.png +%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png +%{tde_datadir}/services/aim.protocol +%endif ########## @@ -812,18 +742,6 @@ designed to be used for sharing files with friends. %{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 @@ -866,6 +784,11 @@ 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 %if 0%{?with_consolehelper} %config(noreplace) /etc/security/console.apps/kppp3 @@ -876,21 +799,11 @@ track of the time spent online for you. %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 @@ -917,18 +830,6 @@ Servers using RDP. %{tde_tdedocdir}/HTML/en/tdeioslave/rdp/ %{tde_tdedocdir}/HTML/en/tdeioslave/vnc/ -%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 @@ -964,18 +865,6 @@ task. %{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 @@ -997,25 +886,10 @@ recommended package libio-socket-ssl-perl. %{tde_tdelibdir}/ksirc.* %{tde_tdeappdir}/ksirc.desktop %{tde_datadir}/apps/ksirc/ -%config(noreplace) %{tde_datadir}/config/ksircrc +%config(noreplace) %{tde_confdir}/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 @@ -1023,6 +897,7 @@ Summary: Talk daemon for Trinity Group: Applications/Internet Requires: trinity-kcontrol >= %{tde_version} Requires: trinity-tdebase-data >= %{tde_version} +Requires: xinetd %description -n trinity-ktalkd KTalkd is an enhanced talk daemon - a program to handle incoming talk @@ -1036,26 +911,15 @@ and shouldn't be run on a multi-user machine. %{tde_bindir}/mail.local %{tde_tdelibdir}/kcm_ktalkd.* %{tde_tdeappdir}/kcmktalkd.desktop -%config(noreplace) %{tde_datadir}/config/ktalkdrc +%config(noreplace) %{tde_confdir}/ktalkdrc %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png %{tde_datadir}/sounds/ktalkd.wav +%dir %{_sysconfdir}/xinetd.d %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" @@ -1084,18 +948,6 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz %{tde_tdedocdir}/HTML/en/kwifimanager/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/ - -%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 ########## @@ -1114,12 +966,6 @@ automatically when needed. %{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 @@ -1152,12 +998,6 @@ but relying only on the TCP/IP 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 @@ -1186,12 +1026,6 @@ A tdeioslave and tded module that provide Zeroconf support. Try %{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 @@ -1238,6 +1072,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -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} \ @@ -1350,5 +1185,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec index 35dcfa815..aeebf5048 100644 --- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec +++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec @@ -1,63 +1,99 @@ -# Avoids relinking, which breaks consolehelper -%define dont_relink 1 - -# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} +# Avoids relinking, which breaks consolehelper +%define dont_relink 1 -# Fedora review: http://bugzilla.redhat.com/195486 +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/ -## Conditional build: -# RHEL6: xmms is outdated ! -#define _with_xmms --with-xmms -%ifnarch s390 s390x -%define _with_wifi --with-wifi +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ %endif -Name: trinity-tdenetwork -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} -Summary: Trinity Desktop Environment - Network Applications - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -License: GPLv2 -Group: Applications/Internet +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} 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 @@ -73,6 +109,16 @@ BuildRequires: sqlite-devel 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 @@ -81,13 +127,34 @@ BuildRequires: libXtst-devel 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: libXmu-devel 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" @@ -97,7 +164,7 @@ BuildRequires: wireless-tools-devel %if 0%{?mgaversion} == 2 || 0%{?mdkversion} BuildRequires: %{_lib}iw29-devel %endif -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 || 0%{?suse_version} BuildRequires: wireless-tools %endif %if 0%{?suse_version} || 0%{?mgaversion} >= 3 @@ -112,7 +179,7 @@ BuildRequires: openslp-devel %endif %ifarch %{ix86} -# BR: %{tde_includedir}/valgrind/valgrind.h +# BR: /usr/include/valgrind/valgrind.h BuildRequires: valgrind %endif @@ -151,9 +218,9 @@ BuildRequires: meanwhile-devel %endif # ORTP support -#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15 #BuildRequires: ortp-devel -#%endif +#endif # SPEEX support %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} @@ -181,7 +248,7 @@ Provides: tdenetwork = %{version}-%{release} Requires: trinity-dcoprss = %{version}-%{release} Requires: %{name}-filesharing = %{version}-%{release} Requires: trinity-kdict = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} +Requires: %{name}-tdefile-plugins = %{version}-%{release} Requires: trinity-kget = %{version}-%{release} Requires: trinity-knewsticker = %{version}-%{release} Requires: trinity-kopete = %{version}-%{release} @@ -204,7 +271,7 @@ Networking applications, including: * dcoprss: RSS utilities for Trinity * filesharing: Network filesharing configuration module for Trinity * kdict: Dictionary client for Trinity -* kfile-plugins: Torrent metainfo plugin for Trinity +* tdefile-plugins: Torrent metainfo plugin for Trinity * kget: downloader manager * knewsticker: RDF newsticker applet * kopete: chat client @@ -268,17 +335,14 @@ Obsoletes: tdenetwork-devel < %{version}-%{release} Provides: tdenetwork-devel = %{version}-%{release} %description devel -This is the development package which contains the headers for the KDE RSS +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/*.h -%{tde_tdeincludedir}/kopete/ui/*.h -%{tde_tdeincludedir}/rss/*.h -%{tde_libdir}/libkdeinit_kdict.la -%{tde_libdir}/libkdeinit_ksirc.la +%{tde_tdeincludedir}/kopete/ +%{tde_tdeincludedir}/rss/ %{tde_libdir}/libkopete.la %{tde_libdir}/libkopete.so %{tde_libdir}/libkopete_msn_shared.la @@ -320,6 +384,7 @@ NFS and Samba. %{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 @@ -340,6 +405,7 @@ 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 @@ -373,35 +439,39 @@ update-desktop-database 2> /dev/null || : ########## -%package kfile-plugins +%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 kfile-plugins +%description tdefile-plugins This package provides a metainformation plugin for bittorrent files. -TDE uses kfile-plugins to provide metainfo tab in the files properties +TDE uses tdefile-plugins to provide metainfo tab in the files properties dialog in konqueror and other file-handling applications. -%files kfile-plugins +%files tdefile-plugins %defattr(-,root,root,-) %{tde_tdelibdir}/kfile_torrent.la %{tde_tdelibdir}/kfile_torrent.so %{tde_datadir}/services/kfile_torrent.desktop -%post kfile-plugins +%post tdefile-plugins update-desktop-database 2> /dev/null || : -%postun kfile-plugins +%postun tdefile-plugins update-desktop-database 2> /dev/null || : ########## %package -n trinity-kget -Summary: download manager for Trinity +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 @@ -424,6 +494,7 @@ applications and Netscape. %{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 @@ -432,13 +503,13 @@ applications and Netscape. %{tde_tdedocdir}/HTML/en/kget %post -n trinity-kget -for f in crystalsvg ; do +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 ; do +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 || : @@ -446,8 +517,9 @@ update-desktop-database 2> /dev/null || : ########## %package -n trinity-knewsticker -Summary: news ticker applet for Trinity +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 @@ -468,7 +540,7 @@ good news sources which provide such files. %{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/eventsrc +%{tde_datadir}/apps/knewsticker/ %{tde_datadir}/icons/hicolor/*/apps/knewsticker.png %{tde_datadir}/services/kntsrcfilepropsdlg.desktop %{tde_tdedocdir}/HTML/en/knewsticker @@ -488,13 +560,15 @@ update-desktop-database 2> /dev/null || : ########## %package -n trinity-kopete -Summary: instant messenger for Trinity +Summary: Instant messenger for Trinity Group: Applications/Internet -URL: http://kopete.kde.org +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, MSN, IRC and Jabber. +of IM systems, such as Yahoo, ICQ, IRC and Jabber. Support for more IM protocols can be added through a plugin system. @@ -527,9 +601,9 @@ Support for more IM protocols can be added through a plugin system. %{tde_libdir}/libkopete_videodevice.so.* %{tde_tdeappdir}/kopete.desktop %{tde_datadir}/apps/kconf_update/kopete-* -%{tde_datadir}/apps/kopete -%{tde_datadir}/apps/kopete_*/*.rc -%{tde_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc +%{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 @@ -656,8 +730,10 @@ update-desktop-database 2> /dev/null || : ########## %package -n trinity-kopete-nowlistening -Summary: Nowlistening (xmms) plugin for Kopete. +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 @@ -678,6 +754,7 @@ noatun, kscd, juk, kaffeine and amarok. %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 @@ -708,7 +785,7 @@ update-desktop-database 2> /dev/null || : ########## %package -n trinity-kppp -Summary: modem dialer and ppp frontend for Trinity +Summary: Modem dialer and ppp frontend for Trinity Group: Applications/Internet Requires: ppp @@ -733,7 +810,14 @@ track of the time spent online for you. %files -n trinity-kppp %defattr(-,root,root,-) -%{?!with_consolehelper:%{tde_bindir}/kppp} +%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 @@ -754,6 +838,10 @@ 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 @@ -780,18 +868,19 @@ Servers using RDP. %{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 ; do +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 ; do +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 || : @@ -820,9 +909,10 @@ task. %{tde_tdelibdir}/kded_kinetd.so %{tde_tdeappdir}/kcmkrfb.desktop %{tde_tdeappdir}/krfb.desktop -%{tde_datadir}/apps/kinetd/eventsrc +%{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 @@ -831,13 +921,13 @@ task. %{tde_tdedocdir}/HTML/en/krfb/ %post -n trinity-krfb -for f in crystalsvg locolor ; do +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 locolor ; do +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 || : @@ -849,7 +939,7 @@ Summary: IRC client for Trinity Group: Applications/Internet %description -n trinity-ksirc -KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a +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 @@ -887,6 +977,8 @@ update-desktop-database 2> /dev/null || : %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 @@ -901,20 +993,21 @@ and shouldn't be run on a multi-user machine. %{tde_tdelibdir}/kcm_ktalkd.* %{tde_tdeappdir}/kcmktalkd.desktop %config(noreplace) %{tde_datadir}/config/ktalkdrc -%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.* +%{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 ; do +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 ; do +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 || : @@ -925,6 +1018,7 @@ update-desktop-database 2> /dev/null || : %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 @@ -944,7 +1038,7 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/apps/kwifimanager %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz -%doc %{tde_tdedocdir}/HTML/en/kwifimanager +%{tde_tdedocdir}/HTML/en/kwifimanager/ %post -n trinity-kwifimanager for f in hicolor ; do @@ -986,6 +1080,8 @@ automatically when needed. %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" @@ -1002,7 +1098,7 @@ but relying only on the TCP/IP protocol. %{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/README +%{tde_datadir}/apps/lisa/ %{tde_datadir}/apps/remoteview/lan.desktop %{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/ %{tde_tdedocdir}/HTML/en/lisa/ @@ -1024,7 +1120,7 @@ Summary: Zeroconf support for TDE Group: Applications/Internet %description -n trinity-kdnssd -A kioslave and kded module that provide Zeroconf support. Try +A tdeioslave and tded module that provide Zeroconf support. Try "zeroconf:/" in Konqueror. %files -n trinity-kdnssd @@ -1053,7 +1149,7 @@ update-desktop-database 2> /dev/null || : ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1061,6 +1157,15 @@ update-desktop-database 2> /dev/null || : %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 @@ -1085,6 +1190,7 @@ fi -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} \ @@ -1115,6 +1221,17 @@ 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 @@ -1130,28 +1247,62 @@ 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} -%changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 +%if 0%{?suse_version} +# Check permissions on setuid files (openSUSE specific) +%verifyscript +%verify_permissions -e %{tde_bindir}/kppp +%endif -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option -- Disable 'lisa' service -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc index ad8188f40..8d22f2fc6 100644 --- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc +++ b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc @@ -1 +1,3 @@ setBadness('permissions-file-setuid-bit', 0) +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch new file mode 100644 index 000000000..0770a8af9 --- /dev/null +++ b/redhat/main/tdepim/tdepim-14.0.0.patch @@ -0,0 +1,90 @@ +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-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec index 6f8a7642c..bdedc6699 100644 --- a/redhat/main/tdepim/tdepim-14.0.0.spec +++ b/redhat/main/tdepim/tdepim-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdepim (version R14.0.0) +# spec file for package tdepim (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdepim %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,11 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -53,7 +51,7 @@ BuildRequires: gnokii-devel Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity URL: http://www.trinitydesktop.org/ @@ -70,6 +68,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -91,6 +90,9 @@ BuildRequires: boost-devel BuildRequires: pcre-devel BuildRequires: libidn-devel +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -108,15 +110,13 @@ BuildRequires: brp-check-trinity BuildRequires: gamin-devel %endif -# CURL support +# FLEX support %if 0%{?fedora} >= 15 BuildRequires: flex-static %endif -%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 -BuildRequires: trinity-libcurl-devel -%else + +# CURL support BuildRequires: curl-devel -%endif # GLIB2 support BuildRequires: glib2-devel @@ -141,28 +141,47 @@ BuildRequires: libXcomposite-devel %endif # XSCREENSAVER support -# Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +# 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} %define with_xscreensaver 1 -%if 0%{?rhel} == 5 -BuildRequires: xorg-x11-proto-devel -BuildRequires: gnome-screensaver + +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extras +%if 0%{?fedora} +BuildRequires: xscreensaver-extras-base %endif +BuildRequires: xscreensaver-gl-base +BuildRequires: xscreensaver-gl-extras +%endif + +%if 0%{?suse_version} +BuildRequires: libXScrnSaver-devel +BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra +%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 +BuildRequires: xscreensaver-base +BuildRequires: xscreensaver-extrusion +BuildRequires: xscreensaver-gl %endif %endif +# ACL support +BuildRequires: libacl-devel + Requires: trinity-libtdepim = %{version}-%{release} Requires: %{name}-kfile-plugins = %{version}-%{release} @@ -207,6 +226,7 @@ This metapackage includes a collection of Personal Information Management (PIM) applications provided with the official release of Trinity. %files +%defattr(-,root,root,-) ########## @@ -289,22 +309,6 @@ thousands of internet feeds in a quick, efficient, and familiar way. %{tde_tdedocdir}/HTML/en/akregator/ %{tde_tdedocdir}/HTML/en/tdeioslave/feed/ -%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 @@ -321,18 +325,12 @@ Requires: trinity-akregator = %{version}-%{release} %{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-kdebase-pim-ioslaves +Requires: trinity-tdebase-tdeio-pim-plugins Requires: %{name}-tderesources = %{version}-%{release} %description -n trinity-kaddressbook @@ -381,22 +379,6 @@ LDAP servers, and SQL databases. %{tde_tdeincludedir}/kaddressbook/ %{tde_tdeincludedir}/tdeabc/ -%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 @@ -414,12 +396,6 @@ Requires: trinity-kaddressbook = %{version}-%{release} %{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 @@ -456,20 +432,6 @@ TDE-based, but will also run on other desktops. %{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 @@ -496,20 +458,6 @@ Kandy is aimed at mobile phones with integrated (GSM) modems. %{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 @@ -535,22 +483,6 @@ time they spend on various tasks. %{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 @@ -565,12 +497,6 @@ Group: Development/Libraries/Other %{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 @@ -747,12 +673,6 @@ tracking feature plans. %{tde_tdelibdir}/tdeabc_xmlrpc.la %{tde_tdelibdir}/tdeabc_xmlrpc.so -%post tderesources -/sbin/ldconfig || : - -%postun tderesources -/sbin/ldconfig || : - ########## %package tderesources-devel @@ -821,12 +741,6 @@ Provides: trinity-tdepim-kresources-devel = %{version}-%{release} %{tde_libdir}/libknotesscalix.so %{tde_tdeincludedir}/kpimprefs.h -%post tderesources-devel -/sbin/ldconfig || : - -%postun tderesources-devel -/sbin/ldconfig || : - ########## %package wizards @@ -868,12 +782,6 @@ Kolab, and SUSE Linux Openexchange servers. %{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} @@ -898,14 +806,6 @@ development (?). Kitchensync uses opensync. %{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 ########## @@ -949,27 +849,13 @@ keybox and for retrieving certificates from LDAP servers. %{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} +Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version} # GPG support %if 0%{?suse_version} @@ -990,7 +876,7 @@ Requires: pinentry Requires: procmail Requires: trinity-kaddressbook = %{version}-%{release} Requires: trinity-kleopatra = %{version}-%{release} -Requires: trinity-tdebase-tdeio-pim-plugins >= %{version}-%{release} +Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version} Provides: imap-client, mail-reader @@ -1004,8 +890,8 @@ 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_confdir}/kmail.antispamrc +%{tde_confdir}/kmail.antivirusrc %{tde_bindir}/kmail %{tde_bindir}/kmail_*.sh %{tde_tdelibdir}/kcm_kmail.la @@ -1061,22 +947,6 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3. %{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 @@ -1092,12 +962,6 @@ Group: Development/Libraries/Other %{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 @@ -1116,18 +980,6 @@ include Outlook Express, Evolution, and plain mbox. %{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 @@ -1157,22 +1009,6 @@ signatures. %{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 @@ -1188,12 +1024,6 @@ Requires: trinity-knode = %{version}-%{release} %{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 @@ -1223,22 +1053,6 @@ program. The program supports printing and mailing your notes. %{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 @@ -1257,12 +1071,6 @@ Requires: %{name}-tderesources-devel = %{version}-%{release} %{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 @@ -1280,12 +1088,6 @@ described by RelaxNG schemes. %{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 @@ -1301,12 +1103,6 @@ Requires: trinity-kode = %{version}-%{release} %{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 @@ -1325,20 +1121,6 @@ frontend to manage your calendars. %{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 @@ -1397,22 +1179,6 @@ scheduling, address book and other PIM functionality. %{tde_datadir}/servicetypes/kontactplugin.desktop %{tde_tdedocdir}/HTML/en/kontact/ -%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 @@ -1431,12 +1197,6 @@ Requires: trinity-kontact = %{version}-%{release} %{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 @@ -1482,6 +1242,7 @@ installed. %{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 @@ -1496,22 +1257,6 @@ installed. %{tde_tdedocdir}/HTML/en/korganizer/ %{tde_tdedocdir}/HTML/en/tdeioslave/webcal/ -%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 @@ -1537,12 +1282,6 @@ Requires: trinity-korganizer = %{version}-%{release} %{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 @@ -1570,22 +1309,6 @@ Korn run a program once you click on the docked icon in Kicker. %{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 @@ -1607,20 +1330,6 @@ mail servers and embed the mail properties as well as the actual attachments. %{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 @@ -1637,12 +1346,6 @@ This is the runtime package for programs that use the libindex library. %defattr(-,root,root,-) %{tde_libdir}/libindex.so.* -%post -n trinity-libindex -/sbin/ldconfig || : - -%postun -n trinity-libindex -/sbin/ldconfig || : - ########## %package -n trinity-libindex-devel @@ -1664,12 +1367,6 @@ library. %{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 @@ -1697,7 +1394,8 @@ This is the runtime package for programs that use the libkcal-trinity library. %{tde_libdir}/libkcal.so.* %{tde_libdir}/libkcal_resourceremote.so.* %{tde_libdir}/libkholidays.so.* -%{tde_datadir}/apps/libkholidays +%{tde_datadir}/apps/libkholidays/ +%dir %{tde_datadir}/services/tderesources/kcal %{tde_datadir}/services/tderesources/kcal/imap.desktop %{tde_datadir}/services/tderesources/kcal/tdeabc.desktop %{tde_datadir}/services/tderesources/kcal/local.desktop @@ -1705,12 +1403,6 @@ This is the runtime package for programs that use the libkcal-trinity library. %{tde_datadir}/services/tderesources/kcal/remote.desktop %{tde_datadir}/services/tderesources/kcal_manager.desktop -%post -n trinity-libkcal -/sbin/ldconfig || : - -%postun -n trinity-libkcal -/sbin/ldconfig || : - ########## %package -n trinity-libkcal-devel @@ -1738,12 +1430,6 @@ library. %{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 @@ -1772,20 +1458,6 @@ This is the runtime package for programs that use the trinity-libtdepim library. %{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 @@ -1807,12 +1479,6 @@ library. %{tde_libdir}/libtdepim.la %{tde_libdir}/libtdepim.so -%post -n trinity-libtdepim-devel -/sbin/ldconfig || : - -%postun -n trinity-libtdepim-devel -/sbin/ldconfig || : - ########## %package -n trinity-libkgantt @@ -1827,12 +1493,6 @@ This is the runtime package for programs that use the libkgantt-trinity library. %{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 @@ -1851,12 +1511,6 @@ library. %{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 @@ -1872,7 +1526,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra %files -n trinity-libkleopatra %defattr(-,root,root,-) -%{tde_datadir}/config/libkleopatrarc +%{tde_confdir}/libkleopatrarc %{tde_libdir}/libgpgme++.so.* %{tde_libdir}/libkleopatra.so.* %{tde_libdir}/libkpgp.so.* @@ -1883,20 +1537,6 @@ This is the runtime package for programs that use the libkleopatra-trinity libra %{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 @@ -1926,12 +1566,6 @@ libkleopatra-trinity library. %{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 @@ -1947,12 +1581,6 @@ an object tree. %defattr(-,root,root,-) %{tde_libdir}/libkmime.so.* -%post -n trinity-libkmime -/sbin/ldconfig || : - -%postun -n trinity-libkmime -/sbin/ldconfig || : - ########## %package -n trinity-libkmime-devel @@ -1968,12 +1596,6 @@ Requires: trinity-libkmime = %{version}-%{release} %{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 @@ -1990,12 +1612,6 @@ library. %{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 @@ -2017,12 +1633,6 @@ libkpimexchange-trinity library. %{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 @@ -2040,12 +1650,6 @@ library. %defattr(-,root,root,-) %{tde_libdir}/libkpimidentities.so.* -%post -n trinity-libkpimidentities -/sbin/ldconfig || : - -%postun -n trinity-libkpimidentities -/sbin/ldconfig || : - ########## %package -n trinity-libkpimidentities-devel @@ -2061,12 +1665,6 @@ Requires: trinity-libkpimidentities = %{version}-%{release} %{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 @@ -2081,12 +1679,6 @@ This is the runtime package for programs that use the libksieve-trinity library. %{tde_libdir}/libksieve.so.* %{tde_tdedocdir}/HTML/en/tdeioslave/sieve/ -%post -n trinity-libksieve -/sbin/ldconfig || : - -%postun -n trinity-libksieve -/sbin/ldconfig || : - ########## %package -n trinity-libksieve-devel @@ -2105,12 +1697,6 @@ library. %{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 @@ -2129,12 +1715,6 @@ This is the runtime library for packages using the ktnef-trinity library. %defattr(-,root,root,-) %{tde_libdir}/libktnef.so.* -%post -n trinity-libktnef -/sbin/ldconfig || : - -%postun -n trinity-libktnef -/sbin/ldconfig || : - ########## %package -n trinity-libktnef-devel @@ -2158,12 +1738,6 @@ ktnef-trinity library. %{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 @@ -2179,12 +1753,6 @@ This is the runtime package for programs that use the libmimelib-trinity library %defattr(-,root,root,-) %{tde_libdir}/libmimelib.so.* -%post -n trinity-libmimelib -/sbin/ldconfig || : - -%postun -n trinity-libmimelib -/sbin/ldconfig || : - ########## %package -n trinity-libmimelib-devel @@ -2204,12 +1772,6 @@ libmimelib library. %{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 @@ -2244,20 +1806,6 @@ dialing calls, phonebook, and phone status monitoring. %{tde_libdir}/libkmobiledevice.so %{tde_tdedocdir}/HTML/en/kmobile/ -%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 @@ -2269,6 +1817,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %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 @@ -2299,6 +1852,7 @@ fi \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -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} \ @@ -2369,5 +1923,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec index 193d5d800..0f50b7cdb 100644 --- a/redhat/main/tdepim/tdepim-3.5.13.2.spec +++ b/redhat/main/tdepim/tdepim-3.5.13.2.spec @@ -1,23 +1,39 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -26,46 +42,67 @@ BuildRequires: gnokii-devel %endif # TDEPIM optional features -#define with_kitchensync 0 +#define with_kitchensync 1 -Name: trinity-tdepim +Name: trinity-%{tde_pkg} +Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} -License: GPL +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity +URL: http://www.trinitydesktop.org/ -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -Summary: Personal Information Management apps from the official Trinity release +%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 -# [tdepim] Missing LDFLAGS cause FTBFS on MGA2/MDV2011 -Patch14: kdepim-3.5.13-missing_ldflags.patch - -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-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-libcaldav-devel -BuildRequires: trinity-libcarddav-devel +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: glib2-devel -BuildRequires: gcc-c++ -BuildRequires: make 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 @@ -76,6 +113,9 @@ BuildRequires: trinity-libcurl-devel BuildRequires: curl-devel %endif +# GLIB2 support +BuildRequires: glib2-devel + # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}sasl2-devel @@ -162,12 +202,13 @@ 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 +Group: Development/Libraries/Other Obsoletes: tdepim-cmake < %{version}-%{release} @@ -263,7 +304,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-akregator-devel Summary: Development files for trinity-akregator -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-akregator = %{version}-%{release} %description -n trinity-akregator-devel @@ -286,7 +327,7 @@ Requires: trinity-akregator = %{version}-%{release} %package -n trinity-kaddressbook Summary: TDE addressbook application Group: Applications/Communications -Requires: trinity-kdebase-pim-ioslaves +Requires: trinity-tdebase-pim-ioslaves Requires: %{name}-tderesources = %{version}-%{release} %description -n trinity-kaddressbook @@ -355,7 +396,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kaddressbook-devel Summary: Development files for trinity-kaddressbook -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kaddressbook = %{version}-%{release} %description -n trinity-kaddressbook-devel @@ -446,6 +487,7 @@ Kandy is aimed at mobile phones with integrated (GSM) modems. %{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/ @@ -508,7 +550,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-karm-devel Summary: Development files for karm -Group: Development/Libraries +Group: Development/Libraries/Other %description -n trinity-karm-devel %{summary} @@ -671,6 +713,7 @@ tracking feature plans. %{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 @@ -705,7 +748,7 @@ tracking feature plans. %package tderesources-devel Summary: Development files for tderesources -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name}-tderesources = %{version}-%{release} Requires: libcaldav Requires: libcarddav @@ -894,12 +937,21 @@ keybox and for retrieving certificates from LDAP servers. %{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 ########## @@ -1019,7 +1071,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kmail-devel Summary: Development files for kmail -Group: Development/Libraries +Group: Development/Libraries/Other %description -n trinity-kmail-devel %{summary} @@ -1115,7 +1167,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-knode-devel Summary: Development files for trinity-knode -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-knode = %{version}-%{release} %description -n trinity-knode-devel @@ -1155,6 +1207,7 @@ program. The program supports printing and mailing your notes. %{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 @@ -1181,7 +1234,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-knotes-devel Summary: Development files for knots -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-knotes = %{version}-%{release} Requires: %{name}-tderesources-devel = %{version}-%{release} @@ -1228,7 +1281,7 @@ described by RelaxNG schemes. %package -n trinity-kode-devel Summary: Development files for trinity-kode -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kode = %{version}-%{release} %description -n trinity-kode-devel @@ -1316,8 +1369,8 @@ scheduling, address book and other PIM functionality. %{tde_libdir}/libkpinterfaces.so.* %{tde_tdeappdir}/Kontact.desktop %{tde_tdeappdir}/kontactdcop.desktop -%{tde_datadir}/apps/kontact -%{tde_datadir}/apps/kontactsummary/kontactsummary_part.rc +%{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 @@ -1326,6 +1379,7 @@ scheduling, address book and other PIM functionality. %{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 @@ -1355,7 +1409,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-kontact-devel Summary: Development files for kontact -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-kontact = %{version}-%{release} %description -n trinity-kontact-devel @@ -1420,6 +1474,7 @@ installed. %{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 @@ -1453,7 +1508,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package -n trinity-korganizer-devel Summary: Development files for korganizer -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-korganizer = %{version}-%{release} %description -n trinity-korganizer-devel @@ -1584,7 +1639,7 @@ This is the runtime package for programs that use the libindex library. %package -n trinity-libindex-devel Summary: Trinity indexing library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libindex = %{version}-%{release} %description -n trinity-libindex-devel @@ -1613,6 +1668,7 @@ library. 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 @@ -1633,7 +1689,8 @@ This is the runtime package for programs that use the libkcal-trinity library. %{tde_libdir}/libkcal.so.* %{tde_libdir}/libkcal_resourceremote.so.* %{tde_libdir}/libkholidays.so.* -%{tde_datadir}/apps/libkholidays +%{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 @@ -1651,7 +1708,7 @@ This is the runtime package for programs that use the libkcal-trinity library. %package -n trinity-libkcal-devel Summary: Trinity calendaring library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkcal = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} Requires: trinity-libktnef-devel = %{version}-%{release} @@ -1665,7 +1722,7 @@ library. %files -n trinity-libkcal-devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/libemailfunctions/idmapper.h +%{tde_tdeincludedir}/libemailfunctions/ %{tde_tdeincludedir}/libkcal %{tde_libdir}/libkcal.la %{tde_libdir}/libkcal.so @@ -1686,6 +1743,7 @@ library. 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} @@ -1695,14 +1753,14 @@ This is the runtime package for programs that use the trinity-libtdepim library. %files -n trinity-libtdepim %defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la -%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so +%{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}/lib[kt]depim.so.* -%{tde_datadir}/apps/[kt]depimwidgets -%{tde_datadir}/apps/lib[kt]depim -%{tde_datadir}/apps/[kt]depim +%{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 @@ -1725,7 +1783,7 @@ done %package -n trinity-libtdepim-devel Summary: Trinity PIM library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libtdepim = %{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} @@ -1772,7 +1830,7 @@ This is the runtime package for programs that use the libkgantt-trinity library. %package -n trinity-libkgantt-devel Summary: Trinity gantt charting library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkgantt = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} @@ -1836,7 +1894,7 @@ done %package -n trinity-libkleopatra-devel Summary: Trinity GnuPG interface libraries [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkleopatra = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} @@ -1892,7 +1950,7 @@ an object tree. %package -n trinity-libkmime-devel Summary: Development files for libkmime -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkmime = %{version}-%{release} %description -n trinity-libkmime-devel @@ -1913,7 +1971,7 @@ Requires: trinity-libkmime = %{version}-%{release} %package -n trinity-libkpimexchange Summary: Trinity PIM Exchange library -Group: Environment/Libraries +Group: Development/Libraries/Other %description -n trinity-libkpimexchange This is the runtime package for programs that use the libkpimexchange-trinity @@ -1935,7 +1993,7 @@ library. %package -n trinity-libkpimexchange-devel Summary: Trinity PIM Exchange library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkpimexchange = %{version}-%{release} Requires: trinity-libkcal-devel = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} @@ -1946,6 +2004,7 @@ 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 @@ -1984,7 +2043,7 @@ library. %package -n trinity-libkpimidentities-devel Summary: Development files for libkpimidentities -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libkpimidentities = %{version}-%{release} %description -n trinity-libkpimidentities-devel @@ -2024,7 +2083,7 @@ This is the runtime package for programs that use the libksieve-trinity library. %package -n trinity-libksieve-devel Summary: Trinity mail/news message filtering library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libksieve = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} @@ -2072,7 +2131,7 @@ This is the runtime library for packages using the ktnef-trinity library. %package -n trinity-libktnef-devel Summary: KTNEF handler library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libktnef = %{version}-%{release} Requires: trinity-libtdepim-devel = %{version}-%{release} @@ -2122,7 +2181,7 @@ This is the runtime package for programs that use the libmimelib-trinity library %package -n trinity-libmimelib-devel Summary: Trinity mime library [development] -Group: Development/Libraries +Group: Development/Libraries/Other Requires: trinity-libmimelib = %{version}-%{release} %description -n trinity-libmimelib-devel @@ -2167,7 +2226,7 @@ dialing calls, phonebook, and phone status monitoring. %{tde_datadir}/services/libkmobile_gammu.desktop %{tde_datadir}/services/libkmobile_skeleton.desktop %{tde_datadir}/servicetypes/libkmobile.desktop -%{tde_datadir}/apps/kmobile/kmobileui.rc +%{tde_datadir}/apps/kmobile/ %{tde_tdeappdir}/kmobile.desktop %{tde_tdelibdir}/libkmobile_skeleton.la %{tde_tdelibdir}/libkmobile_skeleton.so @@ -2192,7 +2251,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -2200,7 +2259,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch14 -p1 -b .ldflags # Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl' if [ -x /usr/bin/perl ]; then @@ -2230,6 +2288,7 @@ fi -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}" \ \ @@ -2269,17 +2328,39 @@ 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 -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdepim/trinity-tdepim-rpmlintrc b/redhat/main/tdepim/trinity-tdepim-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdepim/trinity-tdepim-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec index 341241738..788bd6107 100644 --- a/redhat/main/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdesdk (version R14.0.0) +# spec file for package tdesdk (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -35,17 +37,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - 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}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -61,9 +58,10 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-perl-dcop >= {tde_version} +BuildRequires: trinity-perl-dcop >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: cmake >= 2.8 @@ -81,6 +79,9 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + # IDN support BuildRequires: libidn-devel @@ -122,6 +123,9 @@ BuildRequires: perl BuildRequires: perl-podlators %endif +# OPENSSL support +BuildRequires: openssl-devel + %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel BuildRequires: %{_lib}binutils-devel @@ -218,22 +222,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 @@ -378,22 +366,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 @@ -424,12 +396,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 @@ -456,20 +422,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/services/tderesources/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 @@ -497,20 +449,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop %{tde_tdedocdir}/HTML/en/tdecachegrind/ -%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 @@ -600,12 +538,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/libkstartperf.la %{tde_bindir}/kstartperf -%post misc -/sbin/ldconfig || : - -%postun misc -/sbin/ldconfig || : - ########## %package scripts @@ -761,22 +693,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 @@ -801,12 +717,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/libkspy.la %{tde_libdir}/libkspy.so.* -%post -n trinity-kspy -/sbin/ldconfig || : - -%postun -n trinity-kspy -/sbin/ldconfig || : - ########## %package -n trinity-kuiviewer @@ -838,18 +748,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/services/kuiviewer_part.desktop %{tde_tdedocdir}/HTML/en/kuiviewer/ -%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 @@ -880,12 +778,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 @@ -915,12 +807,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/libtdeinit_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 @@ -977,20 +863,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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} @@ -1039,11 +911,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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 \ @@ -1052,12 +919,6 @@ for proto in svn+file svn+http svn+https svn+ssh svn; do 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 @@ -1096,12 +957,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/libtdeunittestgui.la %{tde_libdir}/libtdeunittestgui.so.* -%post -n trinity-tdeunittest -/sbin/ldconfig || : - -%postun -n trinity-tdeunittest -/sbin/ldconfig || : - ########## %package devel @@ -1163,6 +1018,11 @@ if ! rpm -E %%cmake|grep -q "cd build"; then cd build fi +# FIXME PCLinuxOS: '/usr/bin/ld: cannot find -ltdeabc' +%if 0%{?pclinuxos} +export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}" +%endif + %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ @@ -1246,5 +1106,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec index 75172f4f7..33bcb9f87 100644 --- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec +++ b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec @@ -1,49 +1,100 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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-tdesdk +Name: trinity-%{tde_pkg} Summary: The Trinity Software Development Kit (SDK) +Group: Development/Tools/Other Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2 -Group: User Interface/Desktops +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> + +%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 -Patch1: tdesdk-3.5.13.2-fix_cervisia_pod.patch +%{?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 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} + # for kbugbuster/libkcal -BuildRequires: trinity-tdepim-devel >= %{version} +BuildRequires: desktop-file-utils + +# DB4 support %if 0%{?mgaversion} || 0%{?mdkversion} #BuildRequires: %{_lib}db4.8-devel %endif @@ -53,16 +104,21 @@ BuildRequires: db4-devel %if 0%{?suse_version} BuildRequires: libdb-4_8-devel %endif -BuildRequires: desktop-file-utils + # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex # umbrello BuildRequires: libxslt-devel BuildRequires: libxml2-devel -BuildRequires: perl 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 @@ -99,11 +155,10 @@ Requires: trinity-kompare = %{version}-%{release} Requires: trinity-kspy = %{version}-%{release} Requires: trinity-kuiviewer = %{version}-%{release} Requires: trinity-libcvsservice0 = %{version}-%{release} -Requires: trinity-libcvsservice-devel = %{version}-%{release} Requires: trinity-poxml = %{version}-%{release} Requires: trinity-umbrello = %{version}-%{release} %{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}} -Requires: trinity-kunittest = %{version}-%{release} +Requires: trinity-tdeunittest = %{version}-%{release} %description @@ -111,7 +166,7 @@ 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 -* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind) +* 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 @@ -123,7 +178,7 @@ A collection of applications and tools used by developers, including: %package -n trinity-cervisia Summary: A graphical CVS front end for Trinity -Group: Development/Utilities +Group: Development/Tools/Version Control %description -n trinity-cervisia Cervisia is a TDE-based graphical front end for the CVS client. @@ -147,7 +202,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_tdelibdir}/libcervisiapart.so %{tde_tdeappdir}/cervisia.desktop %{tde_datadir}/apps/cervisia/ -%{tde_datadir}/apps/cervisiapart/cervisiaui.rc +%{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 @@ -180,7 +235,7 @@ 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/Utilities +Group: Development/Languages/Other %description -n trinity-kapptemplate KAppTemplate is a shell script that will create the necessary @@ -204,7 +259,7 @@ fi %package -n trinity-kbabel Summary: PO-file editing suite for Trinity -Group: Development/Utilities +Group: Development/Languages/Other %description -n trinity-kbabel This is a suite of programs for editing gettext message files (PO-files). @@ -277,7 +332,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_tdeappdir}/catalogmanager.desktop %{tde_tdeappdir}/kbabel.desktop %{tde_tdeappdir}/kbabeldict.desktop -%{tde_datadir}/apps/catalogmanager/catalogmanagerui.rc +%{tde_datadir}/apps/catalogmanager/ %{tde_datadir}/apps/kbabel/ %{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd %{tde_datadir}/apps/kconf_update/kbabel-project.upd @@ -340,7 +395,7 @@ 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 +Group: Development/Libraries/Other Requires: trinity-kbabel = %{version}-%{release} %description -n trinity-kbabel-devel @@ -375,8 +430,9 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package -n trinity-kbugbuster -Summary: a front end for the Trinity bug tracking system -Group: Development/Utilities +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. @@ -414,11 +470,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## %package -n trinity-tdecachegrind -Summary: visualisation tool for valgrind profiling output -Group: Development/Utilities +Summary: Visualisation tool for valgrind profiling output +Group: Development/Languages/Other %description -n trinity-tdecachegrind -KCachegrind is a visualisation tool for the profiling data generated +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. @@ -455,8 +511,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## %package -n trinity-tdecachegrind-converters -Summary: format converters for KCachegrind profiling visualisation tool -Group: Development/Utilities +Summary: Format converters for tdecachegrind profiling visualisation tool +Group: Development/Languages/Other Requires: python %if 0%{?suse_version} || 0%{?rhel} == 4 Requires: php @@ -466,9 +522,9 @@ Requires: php-cli %description -n trinity-tdecachegrind-converters This is a collection of scripts for converting the output from -different profiling tools into a format that KCachegrind can use. +different profiling tools into a format that tdecachegrind can use. -KCachegrind is a visualisation tool for the profiling data generated +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. @@ -487,7 +543,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package kfile-plugins Summary: Trinity file dialog plugins for software development files -Group: Environment/Libraries +Group: Development/Languages/Other %description kfile-plugins This is a collection of plugins for the TDE file dialog. These plugins @@ -512,8 +568,8 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package misc -Summary: various goodies from the Trinity Software Development Kit -Group: Development/Libraries +Summary: Various goodies from the Trinity Software Development Kit +Group: Development/Languages/Other %description misc This package contains miscellaneous goodies provided with the official @@ -529,7 +585,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %files misc %defattr(-,root,root,-) -%{tde_tdeincludedir}/kprofilemethod.h %{tde_tdelibdir}/kabcformat_kdeaccounts.la %{tde_tdelibdir}/kabcformat_kdeaccounts.so %{tde_tdelibdir}/plugins/styles/scheck.so @@ -539,7 +594,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/kdepalettes/ %{tde_libdir}/libkstartperf.so.* -%{tde_libdir}/libkstartperf.so %{tde_libdir}/libkstartperf.la %{tde_bindir}/kstartperf @@ -553,7 +607,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/Utilities +Group: Development/Languages/Other Requires: python %description scripts @@ -651,8 +705,8 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package -n trinity-kmtrace -Summary: a Trinity memory leak tracer -Group: Development/Utilities +Summary: A Trinity memory leak tracer +Group: Development/Languages/Other Requires: less %description -n trinity-kmtrace @@ -667,17 +721,16 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/kminspector %{tde_bindir}/kmmatch %{tde_bindir}/kmtrace -%{tde_tdeincludedir}/ktrace.h +%dir %{tde_libdir}/kmtrace %{tde_libdir}/kmtrace/libktrace.la %{tde_libdir}/kmtrace/libktrace.so -%{tde_libdir}/kmtrace/libktrace_s.a -%{tde_datadir}/apps/kmtrace/kde.excludes +%{tde_datadir}/apps/kmtrace/ ########## %package -n trinity-kompare -Summary: a Trinity GUI for viewing differences between files -Group: Development/Utilities +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 @@ -690,15 +743,13 @@ This package is part of Trinity, and a component of the TDE SDK module. %defattr(-,root,root,-) %{tde_bindir}/kompare %{tde_libdir}/libkompareinterface.la -%{tde_libdir}/libkompareinterface.so %{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/komparepartui.rc -%{tde_datadir}/apps/kompare/kompareui.rc +%{tde_datadir}/apps/kompare/ %{tde_datadir}/services/komparenavtreepart.desktop %{tde_datadir}/services/komparepart.desktop %{tde_datadir}/servicetypes/komparenavigationpart.desktop @@ -726,8 +777,8 @@ 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: Environment/Libraries +Summary: Examines the internal state of a Qt/TDE app +Group: Development/Languages/Other Requires: trinity-tdelibs-devel %description -n trinity-kspy @@ -744,9 +795,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %files -n trinity-kspy %defattr(-,root,root,-) -%{tde_tdeincludedir}/kspy.h %{tde_libdir}/libkspy.la -%{tde_libdir}/libkspy.so %{tde_libdir}/libkspy.so.* %post -n trinity-kspy @@ -758,8 +807,8 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package -n trinity-kuiviewer -Summary: viewer for Qt Designer user interface files -Group: Development/Utilities +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 @@ -778,8 +827,8 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_tdelibdir}/quithumbnail.so %{tde_tdelibdir}/quithumbnail.la %{tde_tdeappdir}/kuiviewer.desktop -%{tde_datadir}/apps/kuiviewer/kuiviewerui.rc -%{tde_datadir}/apps/kuiviewerpart/kuiviewer_part.rc +%{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 @@ -801,7 +850,7 @@ done %package -n trinity-libcvsservice0 Summary: DCOP service for accessing CVS repositories -Group: Environment/Libraries +Group: Development/Languages/Other Requires: cvs %description -n trinity-libcvsservice0 @@ -836,8 +885,8 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package -n trinity-libcvsservice-devel -Summary: development files for CVS DCOP service -Group: Development/Libraries +Summary: Development files for CVS DCOP service +Group: Development/Libraries/Other Requires: trinity-libcvsservice0 = %{version}-%{release} %description -n trinity-libcvsservice-devel @@ -871,8 +920,8 @@ This package is part of Trinity, and a component of the TDE SDK module. ########## %package -n trinity-poxml -Summary: tools for using PO-files to translate DocBook XML files -Group: Development/Utilities +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 @@ -895,7 +944,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package -n trinity-umbrello Summary: UML modelling tool and code generator -Group: Development/Utilities +Group: Development/Languages/Other %description -n trinity-umbrello Umbrello UML Modeller is a Unified Modelling Language editor for TDE. @@ -943,8 +992,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %if 0%{?build_kioslave} %package tdeio-plugins -Summary: subversion ioslave for Trinity -Group: Environment/Libraries +Summary: Subversion ioslave for Trinity +Group: Development/Languages/Other Requires: subversion Obsoletes: trinity-tdesdk-kio-plugins < %{version}-%{release} @@ -1018,57 +1067,78 @@ fi ########## -%package -n trinity-kunittest -Summary: unit testing library for Trinity -Group: Development/Utilities +%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-kunittest -KUnitTest is a small library that facilitates the writing of tests for -TDE developers. There are two ways to use the KUnitTest library. One is -to create dynamically loadable modules and use the kunittestmodrunner or -kunittestguimodrunner programs to run the tests. The other is to use the +%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-kunittest +%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 %{tde_libdir}/libkunittestgui.so.* -%{tde_tdeincludedir}/kunittest/runnergui.h -%post -n trinity-kunittest +%post -n trinity-tdeunittest /sbin/ldconfig || : -%postun -n trinity-kunittest +%postun -n trinity-tdeunittest /sbin/ldconfig || : ########## %package devel Summary: Development files for %{name} -Group: Development/Libraries +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 -%{summary}. +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%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -1077,7 +1147,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .cervisiapod +%{?tde_patch:%patch1 -p1} %build @@ -1101,6 +1171,7 @@ fi -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 \ \ @@ -1144,17 +1215,36 @@ export PATH="%{tde_bindir}:${PATH}" # 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 -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc b/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdetoys/tdetoys-14.0.0.spec b/redhat/main/tdetoys/tdetoys-14.0.0.spec index 28f168bb5..26898ec16 100644 --- a/redhat/main/tdetoys/tdetoys-14.0.0.spec +++ b/redhat/main/tdetoys/tdetoys-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdetoys (version R14.0.0) +# spec file for package tdetoys (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -20,7 +20,9 @@ # Having KDE libraries may cause FTBFS here ! # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -33,16 +35,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Toys and Amusements Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Amusements/Graphics URL: http://www.trinitydesktop.org/ @@ -93,9 +90,16 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif +# ACL support +BuildRequires: libacl-devel + # PCRE support BuildRequires: pcre-devel +# OPENSSL support +BuildRequires: openssl-devel + + Obsoletes: trinity-kdetoys < %{version}-%{release} Provides: trinity-kdetoys = %{version}-%{release} @@ -155,16 +159,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -229,14 +223,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -259,16 +245,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -298,16 +274,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -327,14 +293,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -378,16 +336,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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 @@ -420,16 +368,6 @@ This package is part of Trinity, and a component of the TDE toys module. %{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%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -497,5 +435,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec index aa31d8b07..28542f0b2 100644 --- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec +++ b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -24,7 +19,7 @@ Summary: Trinity Desktop Environment - Toys and Amusements Name: trinity-tdetoys Group: Amusements/Graphics Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz @@ -433,9 +428,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec index 8186daa2f..51ba2ca49 100644 --- a/redhat/main/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdeutils (version R14.0.0) +# spec file for package tdeutils (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -20,10 +20,13 @@ # Having KDE libraries may cause FTBFS here ! # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -34,16 +37,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Summary: TDE Utilities Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/System URL: http://www.trinitydesktop.org/ @@ -63,6 +61,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: klaptop_acpi_helper.pam Source2: klaptop_acpi_helper.console Source3: kcmlaptoprc +Source4: %{name}-rpmlintrc Obsoletes: trinity-kdeutils < %{version}-%{release} Provides: trinity-kdeutils = %{version}-%{release} @@ -71,7 +70,9 @@ Provides: trinity-kdeutils-extras = %{version}-%{release} Obsoletes: tdeutils < %{version}-%{release} Provides: tdeutils = %{version}-%{release} +BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ @@ -120,9 +121,9 @@ BuildRequires: gamin-devel BuildRequires: pcre-devel # XMMS support -#%if 0%{?fedora} +#if 0#{?fedora} #BuildRequires: xmms-devel -#%endif +#endif # KLAPTOPDAEMON # Not for RHEL 4! @@ -130,8 +131,11 @@ BuildRequires: pcre-devel %define build_klaptopdaemon 1 %endif +# ACL support +BuildRequires: libacl-devel + # XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} BuildRequires: libXScrnSaver-devel @@ -145,6 +149,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %endif +# OPENSSL support +BuildRequires: openssl-devel + # CONSOLEHELPER (usermode) support %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_consolehelper 1 @@ -153,6 +160,9 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %define dont_relink 1 %endif +%if "%{?tde_version}" == "14.1.0" +%define build_tdefilereplace 1 +%endif Requires: trinity-ark = %{version}-%{release} Requires: trinity-kcalc = %{version}-%{release} @@ -173,36 +183,39 @@ Requires: trinity-ksim = %{version}-%{release} Requires: trinity-ktimer = %{version}-%{release} Requires: trinity-tdewalletmanager = %{version}-%{release} Requires: trinity-superkaramba = %{version}-%{release} - +%if 0%{?build_tdefilereplace} +Requires: trinity-tdefilereplace = %{version}-%{release} +%endif %description Utilities for the Trinity Desktop Environment, including: - * ark (tar/gzip archive manager) - * kcalc (scientific calculator) - * kcharselect (character selector) - * tdelirc (infrared control) - * tdessh (ssh front end) - * kdf (view disk usage) - * kedit (simple text editor) - * kfloppy (floppy formatting tool) - * kgpg (gpg gui) - * khexedit (hex editor) - * kjots (note taker) +* ark (tar/gzip archive manager) +* kcalc (scientific calculator) +* kcharselect (character selector) +* tdelirc (infrared control) +* tdessh (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); +* klaptopdaemon (battery monitoring and management for laptops); %endif - * kmilo - * kregexpeditor (regular expression editor) - * ksim (system information monitor); - * ktimer (task scheduler) - * kwikdisk (removable media utility) +* kmilo +* kregexpeditor (regular expression editor) +* ksim (system information monitor); +* ktimer (task scheduler) +* kwikdisk (removable media utility) +* tdefilereplace: batch search and replace tool %files ########## %package -n trinity-ark -Summary: graphical archiving tool for Trinity +Summary: Graphical archiving tool for Trinity Group: Applications/Utilities #Requires: ncompress Requires: unzip @@ -222,7 +235,7 @@ 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, +Ark can work closely with Konqueror in the TDE environment to handle archives, if you install the Konqueror Integration plugin available in the konq-plugins package. @@ -242,26 +255,10 @@ package. %{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 +Summary: Calculator for Trinity Group: Applications/Utilities %description -n trinity-kcalc @@ -287,30 +284,15 @@ It provides: %{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 +Summary: Character selector for Trinity Group: Applications/Utilities +Requires: trinity-kicker %description -n trinity-kcharselect -A character set selector for TDE. +This package contains kcharselect, a character set selector for TDE. %files -n trinity-kcharselect %defattr(-,root,root,-) @@ -324,25 +306,12 @@ A character set selector for TDE. %{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-tdelirc -Summary: infrared control for Trinity +Summary: Infrared control for Trinity Group: Applications/Utilities +Requires: trinity-filesystem Obsoletes: trinity-kdelirc < %{version}-%{release} Provides: trinity-kdelirc = %{version}-%{release} @@ -365,6 +334,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE. %{tde_datadir}/apps/profiles/konqueror.profile.xml %{tde_datadir}/apps/profiles/noatun.profile.xml %{tde_datadir}/apps/profiles/profile.dtd +%dir %{tde_datadir}/apps/remotes %{tde_datadir}/apps/remotes/RM-0010.remote.xml %{tde_datadir}/apps/remotes/cimr100.remote.xml %{tde_datadir}/apps/remotes/hauppauge.remote.xml @@ -377,26 +347,10 @@ This is a frontend for the LIRC suite to use infrared devices with TDE. %{tde_tdedocdir}/HTML/en/irkick/ %{tde_tdedocdir}/HTML/en/kcmlirc/ -%post -n trinity-tdelirc -/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-tdelirc -/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-tdessh -Summary: ssh frontend for Trinity +Summary: Ssh frontend for Trinity Group: Applications/Utilities %if 0%{?suse_version} Requires: openssh @@ -417,8 +371,9 @@ This package contains TDE's frontend for ssh. ########## %package -n trinity-kdf -Summary: disk space utility for Trinity +Summary: Disk space utility for Trinity Group: Applications/Utilities +Requires: trinity-kcontrol %description -n trinity-kdf KDiskFree displays the available file devices (hard drive partitions, floppy @@ -442,24 +397,10 @@ in a file manager. %{tde_tdedocdir}/HTML/en/kdf/ %{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/ -%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 +Summary: Basic text editor for Trinity Group: Applications/Utilities %description -n trinity-kedit @@ -477,31 +418,15 @@ reasonably fast start. %{tde_tdelibdir}/kedit.so %{tde_libdir}/libtdeinit_kedit.so %{tde_tdeappdir}/KEdit.desktop -%{tde_datadir}/apps/kedit/keditui.rc +%{tde_datadir}/apps/kedit/ %{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 +Summary: Floppy formatter for Trinity Group: Applications/Utilities Requires: dosfstools @@ -517,20 +442,6 @@ to format 3.5" and 5.25" floppy disks. %{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 @@ -566,20 +477,6 @@ Features: %{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 @@ -601,32 +498,16 @@ support and other powerful features. %{tde_libdir}/libkhexeditcommon.so.* %{tde_tdeappdir}/khexedit.desktop %{tde_datadir}/apps/khexedit/ -%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc +%{tde_datadir}/apps/khexedit2part/ %{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 +Summary: Note taking utility for Trinity Group: Applications/Utilities %description -n trinity-kjots @@ -642,28 +523,14 @@ program included in the tkgoodstuff package. %{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 +Summary: Battery monitoring and management for laptops using Trinity Group: Applications/Utilities -Requires: pm-utils +Requires: trinity-kcontrol %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' @@ -708,30 +575,14 @@ power management, for laptops, from within TDE. %{_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 || : +%config %{tde_confdir}/kcmlaptoprc %endif ########## %package -n trinity-kmilo -Summary: laptop special keys support for Trinity +Summary: Laptop special keys support for Trinity Group: Applications/Utilities %description -n trinity-kmilo @@ -749,21 +600,18 @@ with special keys. %{tde_tdelibdir}/kmilo_generic.so %{tde_libdir}/libkmilo.so.* %{tde_datadir}/services/kded/kmilod.desktop +%dir %{tde_datadir}/services/kmilo %{tde_datadir}/services/kmilo/kmilo_generic.desktop +%dir %{tde_datadir}/servicetypes/kmilo %{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 +Summary: Non-standard plugins for KMilo Group: Applications/Utilities Requires: trinity-kmilo = %{version}-%{release} +Requires: trinity-kcontrol %description -n trinity-kmilo-legacy KMilo lets you use the special keys on some keyboards and laptops. @@ -800,7 +648,7 @@ plugin, if you need this package please file a bug. ########## %package -n trinity-kregexpeditor -Summary: graphical regular expression editor plugin for Trinity +Summary: Graphical regular expression editor plugin for Trinity Group: Applications/Utilities %description -n trinity-kregexpeditor @@ -819,27 +667,12 @@ with TDE. It let you draw your regular expression in an unambiguous way. %{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 +Summary: System information monitor for Trinity Group: Applications/Utilities +Requires: trinity-kicker %description -n trinity-ksim KSim is a system monitor app which has its own plugin system with support @@ -848,7 +681,7 @@ connections, power, etc. %files -n trinity-ksim %defattr(-,root,root,-) -%config %{tde_datadir}/config/ksim_panelextensionrc +%config %{tde_confdir}/ksim_panelextensionrc %{tde_tdelibdir}/ksim_*.la %{tde_tdelibdir}/ksim_*.so %{tde_libdir}/libksimcore.so.* @@ -858,24 +691,10 @@ connections, power, etc. %{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 +Summary: Timer utility for Trinity Group: Applications/Utilities %description -n trinity-ktimer @@ -890,24 +709,10 @@ command execution. %{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-tdewalletmanager -Summary: wallet manager for Trinity +Summary: Wallet manager for Trinity Group: Applications/Utilities Obsoletes: trinity-kwalletmanager < %{version}-%{release} @@ -932,24 +737,10 @@ keeps a master password to all wallets. %{tde_datadir}/services/tdewalletmanager_show.desktop %{tde_tdedocdir}/HTML/en/tdewallet/ -%post -n trinity-tdewalletmanager -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-tdewalletmanager -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 +Summary: A program based on karamba improving the eyecandy of TDE Group: Applications/Utilities %description -n trinity-superkaramba @@ -967,8 +758,8 @@ Here are just some examples of the things that can be done: %files -n trinity-superkaramba %defattr(-,root,root,-) %{tde_bindir}/superkaramba -%{tde_datadir}/applnk/Utilities/superkaramba.desktop -%{tde_datadir}/apps/superkaramba/superkarambaui.rc +%{tde_tdeappdir}/superkaramba.desktop +%{tde_datadir}/apps/superkaramba/ %{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png %{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png %{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz @@ -976,17 +767,40 @@ Here are just some examples of the things that can be done: %{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 +%if 0%{?build_tdefilereplace} + +%package -n trinity-tdefilereplace +Summary: Batch search-and-replace component for TDE +Group: Applications/Utilities + +Obsoletes: trinity-kfilereplace < %{version}-%{release} +Provides: trinity-kfilereplace = %{version}-%{release} + +%description -n trinity-tdefilereplace +TDEFileReplace 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 TDEFileReplace does not come as a standalone +application. + +This package is part of Trinity, as a component of the TDE utilities module. + +%files -n trinity-tdefilereplace +%defattr(-,root,root,-) +%{tde_bindir}/tdefilereplace +%{tde_tdelibdir}/libtdefilereplacepart.la +%{tde_tdelibdir}/libtdefilereplacepart.so +%{tde_tdeappdir}/tdefilereplace.desktop +%{tde_datadir}/apps/tdefilereplace/ +%{tde_datadir}/apps/tdefilereplacepart/ +%{tde_tdedocdir}/HTML/en/tdefilereplace/ +%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png +%{tde_datadir}/services/tdefilereplacepart.desktop + +%endif ########## @@ -1003,7 +817,7 @@ Obsoletes: tdeutils-devel < %{version}-%{release} Provides: tdeutils-devel = %{version}-%{release} %description devel -Development files for %{name}. +This package contains the development files for tdeutils. %files devel %defattr(-,root,root,-) @@ -1026,12 +840,6 @@ Development files for %{name}. %{tde_libdir}/libkhexeditcommon.so %{tde_datadir}/cmake/libksimcore.cmake -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -1043,6 +851,14 @@ Development files for %{name}. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?rhel} == 5 +# Reverts some older Python stuff +%__sed -i "superkaramba/src/"*".cpp" \ + -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \ + -e "s|PyBytes_AsString|PyString_AsString|g" \ + -e "s|PyBytes_FromString|PyString_FromString|g" \ +%endif + %build unset QTDIR QTINC QTLIB @@ -1071,6 +887,7 @@ fi \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DDOC_INSTALL_DIR="%{tde_docdir}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ @@ -1119,7 +936,7 @@ export PATH="%{tde_bindir}:${PATH}" %endif # klaptop settings file -%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc" +%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc" %else @@ -1131,28 +948,34 @@ export PATH="%{tde_bindir}:${PATH}" %endif +# Fix desktop shortcut location +%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop" + # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file KEdit Utility TextEditor -%suse_update_desktop_file superkaramba Utility DesktopUtility -%suse_update_desktop_file KCharSelect Utility Accessibility -%suse_update_desktop_file khexedit Utility Editor -%suse_update_desktop_file Kjots Utility TimeUtility -%suse_update_desktop_file ktimer Utility TimeUtility -%suse_update_desktop_file kwikdisk System Applet -%suse_update_desktop_file kdf System Filesystem -%suse_update_desktop_file ark System Archiving -%suse_update_desktop_file kcalc Utility Calculator -%suse_update_desktop_file kgpg Utility Security -%suse_update_desktop_file irkick Applet -%suse_update_desktop_file tdewalletmanager Applet -%suse_update_desktop_file kregexpeditor Utility Editor +%suse_update_desktop_file KEdit Utility TextEditor +%suse_update_desktop_file superkaramba Utility DesktopUtility +%suse_update_desktop_file KCharSelect Utility Accessibility +%suse_update_desktop_file khexedit Utility Editor +%suse_update_desktop_file Kjots Utility TimeUtility +%suse_update_desktop_file ktimer Utility TimeUtility +%suse_update_desktop_file kwikdisk System Applet +%suse_update_desktop_file kdf System Filesystem +%suse_update_desktop_file ark System Archiving +%suse_update_desktop_file kcalc Utility Calculator +%suse_update_desktop_file kgpg Utility Security +%suse_update_desktop_file irkick Applet +%suse_update_desktop_file tdewalletmanager Applet +%suse_update_desktop_file kregexpeditor Utility Editor %suse_update_desktop_file kcmdf %suse_update_desktop_file kcmlirc %suse_update_desktop_file tdewalletconfig %suse_update_desktop_file thinkpad %suse_update_desktop_file kvaio -%suse_update_desktop_file KFloppy System Filesystem +%suse_update_desktop_file KFloppy System Filesystem +%if 0%{?build_tdefilereplace} +%suse_update_desktop_file -r tdefilereplace System FileManager +%endif %endif # Icons from TDE Control Center should only be displayed in TDE @@ -1164,11 +987,23 @@ for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do fi done +# Other TDE-only apps +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/thinkpad.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kvaio.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmdf.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/khexedit.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kgpg.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/Kjots.desktop" + +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" + %clean %__rm -rf "%{?buildroot}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec index b8ed9aa9f..13f1e9c46 100644 --- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec +++ b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdeutils Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPL Summary: TDE Utilities Group: Applications/System @@ -1066,11 +1061,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec index 820d5af36..e958532c8 100644 --- a/redhat/main/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdevelop (version R14.0.0) +# spec file for package tdevelop (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -38,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Integrated Development Environment for C++/C Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Development/Tools URL: http://www.trinitydesktop.org/ @@ -55,6 +58,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc Requires: %{name}-libs = %{version}-%{release} @@ -119,15 +123,25 @@ BuildRequires: subversion-devel # NEON support BuildRequires: neon-devel -# LDAP support +# OPENLDAP support +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel -%else -BuildRequires: openldap-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: openldap24-libs-devel %endif -# ACL support +# LIBACL support +%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: libacl-devel +%endif + +# OPENSSL support +BuildRequires: openssl-devel + %description The TDevelop Integrated Development Environment provides many features @@ -159,9 +173,11 @@ individual needs. %{tde_bindir}/kdevdesigner %{tde_bindir}/tdevelop %{tde_bindir}/tdevelop-htdig -%{tde_bindir}/kdevprj2tdevelop +%{tde_bindir}/kdevprj2kdevelop %{tde_bindir}/kdevprofileeditor %{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update +%{tde_confdir}/kdevassistantrc +%{tde_confdir}/tdeveloprc %{tde_tdeappdir}/kdevassistant.desktop %{tde_tdeappdir}/kdevdesigner.desktop %{tde_tdeappdir}/tdevelop.desktop @@ -447,7 +463,6 @@ individual needs. %{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/ @@ -481,8 +496,6 @@ individual needs. %{tde_datadir}/apps/kdevtrollproject/ %{tde_datadir}/apps/kdevvalgrind/ %{tde_datadir}/apps/tdeio_pydoc/ -%{tde_datadir}/config/kdevassistantrc -%{tde_datadir}/config/tdeveloprc %{tde_datadir}/desktop-directories/tde-development-tdevelop.directory %{tde_tdedocdir}/HTML/en/tdevelop/ %{tde_libdir}/libd.so.0 @@ -498,20 +511,6 @@ individual needs. %{tde_datadir}/services/kdevvisualboyadvance.desktop %{tde_tdedocdir}/HTML/en/kdevdesigner/ -%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 @@ -531,12 +530,6 @@ This package contains the development files for tdevelop. %{tde_libdir}/lib*.la %{tde_includedir}/* -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %package libs @@ -587,12 +580,6 @@ This package contains the libraries needed for the tdevelop programs. %{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 @@ -615,6 +602,12 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# openldap 2.4 includes (CentOS 5) +if [ -d "/usr/include/openldap24" ]; then + RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}" +fi + + if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -632,6 +625,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -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} \ @@ -658,5 +652,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec index 0a2cd496c..0186370c8 100644 --- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec +++ b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec @@ -1,77 +1,121 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - +# +# 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 - -# TDE specific building variables +%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 -%define _docdir %{tde_docdir} -Name: trinity-tdevelop +Name: trinity-%{tde_pkg} Summary: Integrated Development Environment for C++/C Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2 +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: Development/Tools - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -# [c_cpp_ref] Fix library directories detection -Patch1: c_cpp_reference-2.0.2-config.patch -# [c_cpp_ref] Fix installation of 'asm' files -Patch4: c_cpp_reference-2.0.2-install.patch +Requires: %{name}-libs = %{version}-%{release} -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} -Requires: make -Requires: perl -Requires: flex >= 2.5.4 -%if 0%{?rhel} || 0%{?fedora} -Requires: qt3-designer >= 3.3.8.d +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files %endif -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: %{_lib}qt3-devel >= 3.3.8.d + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity %endif -%if 0%{?suse_version} + +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 -Requires: gettext -Requires: ctags -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: trinity-tdesdk-devel >= %{tde_version} +# PCRE support +BuildRequires: pcre-devel + +# DB4 support %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif + +# FLEX support BuildRequires: flex -# FIXME: No CVS support in tdevelop? This is going to suck... -# Requires kdesdk3. +Requires: flex >= 2.5.4 + +# SVN support BuildRequires: subversion-devel + +# NEON support BuildRequires: neon-devel # LDAP support @@ -86,9 +130,6 @@ BuildRequires: openldap-devel BuildRequires: libacl-devel %endif -Obsoletes: trinity-tdevelop < %{version}-%{release} -Provides: trinity-tdevelop = %{version}-%{release} - %description The TDevelop Integrated Development Environment provides many features that developers need as well as providing a unified interface to programs @@ -283,15 +324,15 @@ individual needs. %{tde_tdelibdir}/libkdevvcsmanager.so %{tde_datadir}/apps/kconf_update/ %{tde_datadir}/apps/kdevabbrev/ -%{tde_datadir}/apps/kdevadaproject/kdevadaproject.rc -%{tde_datadir}/apps/kdevadasupport/kdevadasupport.rc -%{tde_datadir}/apps/kdevantproject/kdevantproject.rc -%{tde_datadir}/apps/kdevappoutputview/kdevmakeview.rc +%{tde_datadir}/apps/kdevadaproject/ +%{tde_datadir}/apps/kdevadasupport/ +%{tde_datadir}/apps/kdevantproject/ +%{tde_datadir}/apps/kdevappoutputview/ %{tde_datadir}/apps/kdevappwizard/ -%{tde_datadir}/apps/kdevassistant/kdevassistantui.rc -%{tde_datadir}/apps/kdevastyle/kdevpart_astyle.rc -%{tde_datadir}/apps/kdevautoproject/kdevautoproject.rc -%{tde_datadir}/apps/kdevbashsupport/kdevbashsupport.rc +%{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 @@ -401,50 +442,46 @@ individual needs. %{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop %{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop %{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop -%{tde_datadir}/apps/kdevcsharpsupport/kdevcsharpsupport.rc -%{tde_datadir}/apps/kdevctags2/kdevpart_ctags2.rc -%{tde_datadir}/apps/kdevcustomproject/kdevcustomproject.rc +%{tde_datadir}/apps/kdevcsharpsupport/ +%{tde_datadir}/apps/kdevctags2/ +%{tde_datadir}/apps/kdevcustomproject/ %{tde_datadir}/apps/kdevdebugger/ -%{tde_datadir}/apps/kdevdesigner/kdevdesigner_shell.rc -%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part.rc -%{tde_datadir}/apps/kdevdesignerpart/kdevdesigner_part_sh.rc -%{tde_datadir}/apps/kdevdiff/kdevdiff.rc -%{tde_datadir}/apps/kdevdistpart/kdevpart_distpart.rc +%{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/kdevdoxygen.rc +%{tde_datadir}/apps/kdevdoxygen/ %{tde_datadir}/apps/kdevelop/ %{tde_datadir}/apps/kdevfilecreate/ -%{tde_datadir}/apps/kdevfilelist/kdevfilelist.rc -%{tde_datadir}/apps/kdevfilter/kdevfilter.rc -%{tde_datadir}/apps/kdevfortransupport/kdevfortransupport.rc -%{tde_datadir}/apps/kdevfullscreen/kdevpart_fullscreen.rc +%{tde_datadir}/apps/kdevfilelist/ +%{tde_datadir}/apps/kdevfilter/ +%{tde_datadir}/apps/kdevfortransupport/ +%{tde_datadir}/apps/kdevfullscreen/ %{tde_datadir}/apps/kdevgrepview/ -%{tde_datadir}/apps/kdevjavasupport/kdevjavasupport.rc -%{tde_datadir}/apps/kdevmakeview/kdevmakeview.rc -%{tde_datadir}/apps/kdevpartexplorer/kdevpartexplorer.rc -%{tde_datadir}/apps/kdevpascalproject/kdevpascalproject.rc -%{tde_datadir}/apps/kdevpascalsupport/kdevpascalsupport.rc -%{tde_datadir}/apps/kdevperlsupport/kdevperlsupport.rc -%{tde_datadir}/apps/kdevphpsupport/kdevphpsupport.rc -%{tde_datadir}/apps/kdevphpsupport/phpfunctions -%{tde_datadir}/apps/kdevpythonsupport/kdevpythonsupport.rc -%{tde_datadir}/apps/kdevquickopen/kdevpart_quickopen.rc +%{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/kdevregexptest.rc -%{tde_datadir}/apps/kdevreplace/kdevpart_replace.rc -%{tde_datadir}/apps/kdevrubysupport/kdevrubysupport.rc -%{tde_datadir}/apps/kdevrubysupport/pics/ruby_config.png -%{tde_datadir}/apps/kdevrubysupport/pics/ruby_run.png -%{tde_datadir}/apps/kdevscripting/kdevscripting.rc -%{tde_datadir}/apps/kdevscriptproject/kdevscriptproject.rc -%{tde_datadir}/apps/kdevsnippet/kdevpart_snippet.rc -%{tde_datadir}/apps/kdevsqlsupport/kdevsqlsupport.rc -%{tde_datadir}/apps/kdevtipofday/kdevpart_tipofday.rc -%{tde_datadir}/apps/kdevtipofday/tips -%{tde_datadir}/apps/kdevtools/kdevpart_tools.rc -%{tde_datadir}/apps/kdevtrollproject/kdevtrollproject.rc -%{tde_datadir}/apps/kdevvalgrind/kdevpart_valgrind.rc -%{tde_datadir}/apps/kio_pydoc/kde_pydoc.py* +%{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 @@ -456,12 +493,11 @@ individual needs. %{tde_tdelibdir}/libkdevvisualboyadvance.la %{tde_tdelibdir}/libkdevvisualboyadvance.so %{tde_datadir}/apps/kdevdesignerpart/pics/ -%{tde_datadir}/apps/kdevvisualboyadvance/kdevpart_visualboyadvance.rc +%{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 ||: @@ -480,14 +516,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %package devel Summary: Development files for %{name} -Group: Development/Libraries +Group: Development/Libraries/Other Requires: %{name}-libs = %{version}-%{release} Obsoletes: trinity-kdevelop-devel < %{version}-%{release} Provides: trinity-kdevelop-devel = %{version}-%{release} %description devel -%{summary}. +This package contains the development files for tdevelop. %files devel %defattr(-,root,root,-) @@ -514,7 +550,7 @@ Obsoletes: trinity-kdevelop-libs < %{version}-%{release} Provides: trinity-kdevelop-libs = %{version}-%{release} %description libs -%{summary}. +This package contains the libraries needed for the tdevelop programs. %files libs %defattr(-,root,root,-) @@ -566,16 +602,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release} ########## %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -%patch1 -p0 -b .config -%patch4 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - -%__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin -%__cp -ar admin c_cpp_reference-2.0.2_for_KDE_3.0/ -%__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %build @@ -589,20 +616,6 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -# c references -pushd c_cpp_reference-2.0.2_for_KDE_3.0 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \ - --with-qt-includes=${QTINC:-${QTDIR}/include} \ - --with-extra-libs=%{tde_libdir} -popd - if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build cd build @@ -614,6 +627,7 @@ fi -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} \ @@ -629,14 +643,13 @@ fi %__make %{?_smp_mflags} || %__make -# c references -cd .. -%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0 %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0 + +# Links duplicate files +%fdupes "%{?buildroot}%{tde_datadir}" %clean @@ -644,11 +657,3 @@ cd .. %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc b/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec index a01117ef5..4ddcde0b9 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdewebdev (version R14.0.0) +# spec file for package tdewebdev (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -34,17 +36,12 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} -Summary: Web development applications +Summary: Web development applications Group: Applications/Editors Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -65,6 +62,8 @@ 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 +Source10: %{name}-rpmlintrc + BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdesdk-devel >= %{tde_version} @@ -97,6 +96,9 @@ BuildRequires: perl BuildRequires: libxml2-devel #endif +%if "%{?tde_version}" != "14.1.0" +%define build_tdefilereplace 1 +%endif Obsoletes: trinity-kdewebdev-libs < %{version}-%{release} Provides: trinity-kdewebdev-libs = %{version}-%{release} @@ -105,7 +107,6 @@ Provides: trinity-kdewebdev = %{version}-%{release} Requires: trinity-quanta = %{version}-%{release} Requires: trinity-quanta-data = %{version}-%{release} -Requires: trinity-tdefilereplace = %{version}-%{release} Requires: trinity-kimagemapeditor = %{version}-%{release} Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-kommander = %{version}-%{release} @@ -113,7 +114,6 @@ Requires: trinity-kommander = %{version}-%{release} %description Web development applications, including: -* tdefilereplace: batch search and replace tool * kimagemapeditor: HTML image map editor * klinkstatus: link checker * kommander: visual dialog building tool @@ -128,7 +128,7 @@ Web development applications, including: %package -n trinity-quanta Summary: web development environment for TDE [Trinity] Group: Applications/Development -Requires: trinity-tdefilereplace = %{version}-%{release} +Requires: trinity-tdefilereplace Requires: trinity-klinkstatus = %{version}-%{release} Requires: trinity-kommander = %{version}-%{release} Requires: trinity-quanta-data = %{version}-%{release} @@ -169,21 +169,6 @@ This package is part of TDE, as a component of the TDE web development module. %{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 @@ -205,52 +190,6 @@ This package is part of TDE, as a component of the TDE web development module. ########## -%package -n trinity-tdefilereplace -Summary: batch search-and-replace component for TDE [Trinity] -Group: Applications/Development - -Obsoletes: trinity-kfilereplace < %{version}-%{release} -Provides: trinity-kfilereplace = %{version}-%{release} - -%description -n trinity-tdefilereplace -tdefileReplace 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 tdefileReplace does not come as a standalone -application. An example of an application that uses the tdefileReplace -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-tdefilereplace -%defattr(-,root,root,-) -%{tde_bindir}/tdefilereplace -%{tde_tdelibdir}/libtdefilereplacepart.la -%{tde_tdelibdir}/libtdefilereplacepart.so -%{tde_tdeappdir}/tdefilereplace.desktop -%{tde_datadir}/apps/tdefilereplace/ -%{tde_datadir}/apps/tdefilereplacepart -%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png -%{tde_datadir}/services/tdefilereplacepart.desktop -%{tde_tdedocdir}/HTML/en/tdefilereplace/ - -%post -n trinity-tdefilereplace -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-tdefilereplace -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 Group: Applications/Development @@ -274,20 +213,6 @@ This package is part of TDE, as a component of the TDE web development module. %{tde_datadir}/services/kimagemapeditorpart.desktop %{tde_tdedocdir}/HTML/en/kimagemapeditor/ -%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 @@ -318,20 +243,6 @@ This package is part of TDE, as a component of the TDE web development module. %{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 @@ -384,22 +295,6 @@ This package is part of TDE, as a component of the TDE web development module. %{tde_datadir}/apps/tdevappwizard/ %{tde_datadir}/services/kommander_part.desktop -%post -n trinity-kommander -/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-kommander -/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-kommander-devel @@ -429,12 +324,6 @@ This package is part of TDE, as a component of the TDE web development module. %{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} @@ -479,19 +368,40 @@ This package is part of TDE, as a component of the TDE web development module. %{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 || : +%endif -%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 || : +########## + +%if 0%{?build_tdefilereplace} + +%package -n trinity-tdefilereplace +Summary: Batch search-and-replace component for TDE +Group: Applications/Utilities + +Obsoletes: trinity-kfilereplace < %{version}-%{release} +Provides: trinity-kfilereplace = %{version}-%{release} + +%description -n trinity-tdefilereplace +TDEFileReplace 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 TDEFileReplace does not come as a standalone +application. + +This package is part of Trinity, as a component of the TDE utilities module. + +%files -n trinity-tdefilereplace +%defattr(-,root,root,-) +%{tde_bindir}/tdefilereplace +%{tde_tdelibdir}/libtdefilereplacepart.la +%{tde_tdelibdir}/libtdefilereplacepart.so +%{tde_tdeappdir}/tdefilereplace.desktop +%{tde_datadir}/apps/tdefilereplace/ +%{tde_datadir}/apps/tdefilereplacepart/ +%{tde_tdedocdir}/HTML/en/tdefilereplace/ +%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png +%{tde_datadir}/services/tdefilereplacepart.desktop %endif @@ -529,7 +439,7 @@ Requires: trinity-kommander-devel = %{version}-%{release} %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -561,7 +471,7 @@ fi \ --enable-editors \ --with-extra-includes=%{_includedir}/tqt - + # WTF hack for RHEL4 %if 0%{?rhel} == 4 @@ -597,10 +507,12 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ %suse_update_desktop_file -r kxsldbg Office WebDevelopment %endif %suse_update_desktop_file -r kimagemapeditor Office WebDevelopment -%suse_update_desktop_file -r tdefilereplace System FileManager %suse_update_desktop_file kmdr-editor Development GUIDesigner %suse_update_desktop_file kmdr-executor Development GUIDesigner %suse_update_desktop_file -r quanta Office WebDevelopment +%if 0%{?build_tdefilereplace} +%suse_update_desktop_file -r tdefilereplace System FileManager +%endif %endif # Adds missing icons in 'hicolor' theme @@ -615,5 +527,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec index ae6558596..c26bb4008 100644 --- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec +++ b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdewebdev Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPL Summary: Web development applications Group: Applications/Editors @@ -490,7 +485,7 @@ Requires: trinity-kommander-devel = %{version}-%{release} %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__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" @@ -555,8 +550,3 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc b/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/notes.txt b/redhat/notes.txt index e0f280445..2f2f23fdc 100644 --- a/redhat/notes.txt +++ b/redhat/notes.txt @@ -28,6 +28,11 @@ 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. diff --git a/redhat/packages.f20 b/redhat/packages.f20 new file mode 100644 index 000000000..b0ef5aa2b --- /dev/null +++ b/redhat/packages.f20 @@ -0,0 +1,203 @@ +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.f21 b/redhat/packages.f21 new file mode 100644 index 000000000..263098527 --- /dev/null +++ b/redhat/packages.f21 @@ -0,0 +1,207 @@ +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 +gmime-devel +intltool +clamav +clamav-devel +xbase-devel +sqlite2-devel +imlib2-devel diff --git a/redhat/packages.f22 b/redhat/packages.f22 new file mode 100644 index 000000000..317141219 --- /dev/null +++ b/redhat/packages.f22 @@ -0,0 +1,200 @@ +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.f23 b/redhat/packages.f23 new file mode 100644 index 000000000..c24fc38cb --- /dev/null +++ b/redhat/packages.f23 @@ -0,0 +1,214 @@ +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 +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 +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +libqalculate-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 +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql-devel +pth-devel +pulseaudio-libs-devel +qt4-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 +texinfo +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/packages.f24 b/redhat/packages.f24 new file mode 100644 index 000000000..c659b7389 --- /dev/null +++ b/redhat/packages.f24 @@ -0,0 +1,214 @@ +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 +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 +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +heimdal-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 +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-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 +libmusicbrainz5-devel +libnjb-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvncserver-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 +opensc +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 +pkcs11-helper-devel +poppler-devel +postgresql +postgresql-devel +pth-devel +pulseaudio-libs-devel +qt4-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 +texinfo +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/packages.mga4 b/redhat/packages.mga4 index 3684984f7..500e3f758 100644 --- a/redhat/packages.mga4 +++ b/redhat/packages.mga4 @@ -1,4 +1,5 @@ GraphicsMagick-devel +libotr-devel ImageMagick-devel NetworkManager-glib-devel OpenEXR-devel @@ -205,3 +206,14 @@ 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/packages.oss123 b/redhat/packages.oss123 new file mode 100644 index 000000000..9126b044a --- /dev/null +++ b/redhat/packages.oss123 @@ -0,0 +1,173 @@ +aspell +aspell-devel +audiofile-devel +automake +avahi-devel +bind-devel +binutils-devel +bison +boost-devel +ccache +c++_compiler +cdparanoia +cdparanoia-devel +chrpath +clucene-core-devel +cmake +commoncpp2-devel +createrepo +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +dbus-devel +djvulibre +docbook-xsl-stylesheets +doxygen GraphicsMagick +dssi-devel +esound-devel +fdupes +ffmpeg1-devel +ffmpeg-devel +fftw3-devel +fftw-devel +file-devel +flac-devel +flex +fribidi-devel +gettext-devel +giflib-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 +gtk2-devel +gtk-doc +hal-devel +html2ps +hunspell-devel +ImageMagick-devel +imlib1-devel +java-1.6.0-openjdk-devel +java-1.7.0-openjdk-devel +java-devel +libacl-devel +libart_lgpl-devel +libblkid-devel +libbz2-devel +libcap-devel +libccrtp-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexiv2-devel +libgadu-devel +libgphoto2-devel +libgpod-devel +libhd-devel +libical-devel +libidn-devel +libiw-devel +libjasper-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr2-devel +libotr-devel +libpng15-compat-devel +libpng-devel +libpqxx-devel +librsvg-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libtheora-devel +libtiff-devel +libtool +libtunepimp-devel +libtwolame-devel +libudev-devel +libungif-devel +libv4l-devel +libvisual-devel +libwmf-devel +libwpd-devel +libxine-devel +libxslt-devel +libzrtpcpp-devel +lilo +lirc-devel +make +meanwhile-devel +Mesa-devel +mesa-libGL-devel +mesa-libGLU-devel +mozilla-xulrunner20-devel +mysql-devel +neon-devel +NetworkManager-devel +ocaml +OpenEXR-devel +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +pilot-link-devel +poppler-devel +postgresql +postgresql-devel +pth-devel +pulseaudio-devel +python-devel +python-sip-devel +recode +rsvg-view +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +sqlite-devel +subversion-devel +sword-devel +t1lib-devel +taglib-devel +transfig +trinity-PyQt-devel +udev-devel +unixODBC-devel +update-desktop-files +utempter-devel +valgrind +wv2-devel +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xulrunner-devel +xz-devel +libaudio-devel +fdupes +NetworkManager-devel +udisks-devel +udisks2-devel +libconfig-devel |