Browse Source

RPM Packaging: R14 updates

François Andriot 5 years ago
parent
commit
b6a7c10f39

+ 10
- 0
mageia/README.txt View File

@@ -0,0 +1,10 @@
1
+Note on 2013/07/17 :
2
+
3
+The current TDE packages are built as follow:
4
+
5
+For 3.5.13.x:
6
+1) build "dependencies/qt3" from "mageia" directory
7
+2) build all other packages from "redhat" directory
8
+
9
+For R14 and later:
10
+1) build all packages from "redhat" directory

+ 13
- 0
mandriva/README.txt View File

@@ -0,0 +1,13 @@
1
+Note on 2013/07/17 :
2
+
3
+The stuff in this directory is obsolete.
4
+It looks like it was an attempt to build TDE 3.5.12 on Mandriva 2010.2 .
5
+
6
+The current TDE packages are built as follow:
7
+
8
+For 3.5.13.x:
9
+1) build "dependencies/qt3" from "mageia" directory
10
+2) build all other packages from "redhat" directory
11
+
12
+For R14 and later:
13
+1) build all packages from "redhat" directory

+ 1
- 1
redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec View File

@@ -127,4 +127,4 @@ cd build
127 127
 
128 128
 %changelog
129 129
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
130
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
130
+- Initial build for TDE 14.0.0

+ 8
- 6
redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec View File

@@ -3,6 +3,8 @@
3 3
 %define _variant .opt
4 4
 %endif
5 5
 
6
+%define tde_version 14.0.0
7
+
6 8
 %define tde_bindir %{tde_prefix}/bin
7 9
 %define tde_includedir %{tde_prefix}/include
8 10
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -14,7 +16,7 @@
14 16
 
15 17
 
16 18
 Name:           trinity-libart-lgpl
17
-Version:        14.0.0
19
+Version:        2.3.22
18 20
 Release:        1%{?dist}%{?_variant}
19 21
 
20 22
 Summary:        Library of functions for 2D graphics - runtime files
@@ -29,10 +31,10 @@ Packager:		Francois Andriot <francois.andriot@free.fr>
29 31
 Prefix:			%{tde_prefix}
30 32
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
31 33
 
32
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
34
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
33 35
 
34 36
 BuildRequires:  trinity-tqt3-devel >= 3.5.0
35
-BuildRequires:  trinity-tqtinterface-devel >= 3.5.0
37
+BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
36 38
 
37 39
 %description
38 40
 A library of functions for 2D graphics supporting a superset of the
@@ -134,7 +136,7 @@ especially suitable for embedded applications.
134 136
 ##########
135 137
 
136 138
 %prep
137
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
139
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
138 140
 
139 141
 %__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in"
140 142
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
@@ -174,5 +176,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
174 176
 
175 177
 
176 178
 %changelog
177
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
178
-- Initial build for TDE 3.5.13.2
179
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1
180
+- Initial build for TDE 14.0.0

+ 1
- 2
redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec View File

@@ -30,7 +30,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
30 30
 
31 31
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
32 32
 
33
-BuildRequires:  trinity-tqt3-devel >= %{tde_version}
33
+BuildRequires:  trinity-tqt3-devel >= 3.5.0
34 34
 BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
35 35
 BuildRequires:	trinity-tqca-devel >= 1.0
36 36
 BuildRequires:	openssl-devel >= 0.9.8
@@ -82,4 +82,3 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
82 82
 %changelog
83 83
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
84 84
 - Initial build for TDE 14.0.0
85
-

+ 1
- 1
redhat/dependencies/tqca/tqca-14.0.0.spec View File

@@ -33,7 +33,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
33 33
 
34 34
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
35 35
 
36
-BuildRequires:  trinity-tqt3-devel >= %{tde_version}
36
+BuildRequires:  trinity-tqt3-devel >= 3.5.0
37 37
 BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
38 38
 
39 39
 

+ 1
- 0
redhat/dependencies/tqt3/tqt3-14.0.0.spec View File

@@ -52,6 +52,7 @@ BuildRequires: fontconfig-devel
52 52
 BuildRequires: gcc-c++
53 53
 BuildRequires: libuuid-devel
54 54
 BuildRequires: glib2-devel
55
+BuildRequires: make
55 56
 
56 57
 # NAS support
57 58
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}

+ 2
- 2
redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec View File

@@ -170,5 +170,5 @@ done
170 170
 
171 171
 
172 172
 %changelog
173
-* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
174
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
173
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
174
+- Initial build for TDE 14.0.0

+ 7
- 2
redhat/tdebase/suse-displaymanagers-tdm View File

@@ -7,10 +7,15 @@ tdm_start_proc() {
7 7
 }
8 8
 
9 9
 tdm_vars() {
10
-    TDM_BIN=/opt/trinity/bin/kdm
10
+    if [ -x /opt/trinity/bin/kdm ]; then
11
+      TDM_BIN=/opt/trinity/bin/kdm
12
+      export KDEROOTHOME=/root/.tdm
13
+    else
14
+      TDM_BIN=/opt/trinity/bin/tdm
15
+      export TDEROOTHOME=/root/.tdm
16
+    fi
11 17
     case "${DISPLAYMANAGER##*/}" in
12 18
        tdm)
13
-            export KDEROOTHOME=/root/.kdm
14 19
             DISPLAYMANAGER=$TDM_BIN
15 20
             STARTPROC=tdm_start_proc
16 21
             ;;

+ 60
- 0
redhat/tdebase/tdebase-14.0.0-ftbfs.patch View File

@@ -0,0 +1,60 @@
1
+--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/background/CMakeLists.txt.ORI	2013-07-17 15:07:53.620475336 +0200
2
++++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/background/CMakeLists.txt	2013-07-17 15:08:37.773235444 +0200
3
+@@ -23,6 +23,7 @@
4
+ 
5
+   link_directories(
6
+     ${TQT_LIBRARY_DIRS}
7
++    ${LIBART_LIBRARY_DIRS}
8
+   )
9
+ 
10
+   ##### bgnd (static) #############################
11
+--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/kicker/CMakeLists.txt.ftbfs	2013-07-17 15:10:49.001523716 +0200
12
++++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/kicker/CMakeLists.txt	2013-07-17 15:11:58.278148735 +0200
13
+@@ -22,6 +22,7 @@
14
+ 
15
+ link_directories(
16
+   ${TQT_LIBRARY_DIRS}
17
++  ${LIBART_LIBRARY_DIRS}
18
+ )
19
+ 
20
+ ##### other data ################################
21
+--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/tdm/CMakeLists.txt.ftbfs	2013-07-17 15:14:35.389300184 +0200
22
++++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/tdm/CMakeLists.txt	2013-07-17 15:14:41.479267342 +0200
23
+@@ -19,6 +19,7 @@
24
+ 
25
+ link_directories(
26
+   ${TQT_LIBRARY_DIRS}
27
++  ${LIBART_LIBRARY_DIRS}
28
+ )
29
+ 
30
+ ##### other data ################################
31
+--- trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/icons/CMakeLists.txt.ftbfs	2013-07-17 15:16:26.158703430 +0200
32
++++ trinity-tdebase-14.0.0~pre738+d41051b3/kcontrol/icons/CMakeLists.txt	2013-07-17 15:16:31.722673486 +0200
33
+@@ -19,6 +19,7 @@
34
+ 
35
+ link_directories(
36
+   ${TQT_LIBRARY_DIRS}
37
++  ${LIBART_LIBRARY_DIRS}
38
+ )
39
+ 
40
+ ##### other data ################################
41
+--- trinity-tdebase-14.0.0~pre738+d41051b3/tdm/kfrontend/CMakeLists.txt.ftbfs	2013-07-17 15:22:20.506802399 +0200
42
++++ trinity-tdebase-14.0.0~pre738+d41051b3/tdm/kfrontend/CMakeLists.txt	2013-07-17 15:22:27.893762894 +0200
43
+@@ -26,6 +26,7 @@
44
+ 
45
+ link_directories(
46
+   ${TQT_LIBRARY_DIRS}
47
++  ${LIBART_LIBRARY_DIRS}
48
+ )
49
+ 
50
+ 
51
+--- trinity-tdebase-14.0.0~pre738+d41051b3/kdesktop/CMakeLists.txt.ftbfs	2013-07-17 15:26:02.711616155 +0200
52
++++ trinity-tdebase-14.0.0~pre738+d41051b3/kdesktop/CMakeLists.txt	2013-07-17 15:26:08.085587520 +0200
53
+@@ -36,6 +36,7 @@
54
+ 
55
+ link_directories(
56
+   ${TQT_LIBRARY_DIRS}
57
++  ${LIBART_LIBRARY_DIRS}
58
+ )
59
+ 
60
+ 

+ 143
- 172
redhat/tdebase/tdebase-14.0.0.spec View File

@@ -3,7 +3,9 @@
3 3
 %define _variant .opt
4 4
 %endif
5 5
 
6
-# TDE 3.5.13 specific building variables
6
+%define tde_version 14.0.0
7
+
8
+# TDE specific building variables
7 9
 %define tde_bindir %{tde_prefix}/bin
8 10
 %define tde_datadir %{tde_prefix}/share
9 11
 %define tde_docdir %{tde_datadir}/doc
@@ -41,9 +43,7 @@ Prefix:		%{tde_prefix}
41 43
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
42 44
 
43 45
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
44
-
45
-# Wrapper script to prevent Plasma launch at Trinity Startup
46
-Source1:	plasma-desktop
46
+Patch0:		tdebase-14.0.0-ftbfs.patch
47 47
 
48 48
 # Pam configuration files for RHEL / Fedora
49 49
 %if 0%{?suse_version} == 0
@@ -250,9 +250,9 @@ Requires:	opensuse-manuals_en
250 250
 
251 251
 BuildRequires:	cmake >= 2.8
252 252
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
253
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
254
-BuildRequires:	trinity-arts-devel >= %{version}
255
-BuildRequires:	trinity-tdelibs-devel >= %{version}
253
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
254
+BuildRequires:	trinity-arts-devel >= %{tde_version}
255
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
256 256
 BuildRequires:	gcc-c++
257 257
 BuildRequires:	make
258 258
 BuildRequires:	openssl-devel
@@ -365,8 +365,8 @@ BuildRequires:	nas-devel
365 365
 BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
366 366
 Requires:		dbus-qt >= 0.22-12.EL.9p1
367 367
 %else
368
-BuildRequires:	trinity-dbus-tqt-devel >= %{version}
369
-Requires:		trinity-dbus-tqt >= %{version}
368
+BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
369
+Requires:		trinity-dbus-tqt >= %{tde_version}
370 370
 %endif
371 371
 
372 372
 %if 0%{?fedora} >= 17
@@ -381,16 +381,9 @@ BuildRequires:	%{_lib}jack-devel
381 381
 BuildRequires:	jack-audio-connection-kit-devel
382 382
 %endif
383 383
 
384
-# LIBART support
385
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5
384
+# LIBART_LGPL support
386 385
 %define with_libart 1
387
-%if 0%{?mgaversion} || 0%{?mdkversion}
388
-BuildRequires:	%{_lib}art_lgpl-devel
389
-%endif
390
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
391
-BuildRequires:	libart_lgpl-devel
392
-%endif
393
-%endif
386
+BuildRequires:	trinity-libart-lgpl-devel
394 387
 
395 388
 # SAMBA support
396 389
 %if 0%{?rhel} == 4
@@ -484,9 +477,9 @@ Requires: trinity-libkonq = %{version}-%{release}
484 477
 Requires: %{name}-libtqt3-integration = %{version}-%{release}
485 478
 Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
486 479
  
487
-Requires:	trinity-tqtinterface >= %{version}
488
-Requires:	trinity-arts >= %{version}
489
-Requires:	trinity-tdelibs >= %{version}
480
+Requires:	trinity-tqtinterface >= %{tde_version}
481
+Requires:	trinity-arts >= %{tde_version}
482
+Requires:	trinity-tdelibs >= %{tde_version}
490 483
 Requires:	trinity-tqt3 >= 3.5.0
491 484
 Requires:	openssl
492 485
 
@@ -723,8 +716,8 @@ Some random features:
723 716
 %{tde_tdelibdir}/kate.la
724 717
 %{tde_tdelibdir}/kate.so
725 718
 %{tde_libdir}/libkateutils.so.*
726
-%{tde_libdir}/lib[kt]deinit_kate.la
727
-%{tde_libdir}/lib[kt]deinit_kate.so
719
+%{tde_libdir}/libtdeinit_kate.la
720
+%{tde_libdir}/libtdeinit_kate.so
728 721
 %{tde_tdeappdir}/kate.desktop
729 722
 %{tde_datadir}/apps/kate/
730 723
 %{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
@@ -790,8 +783,8 @@ Kwrite is a text editor for TDE.
790 783
 %{tde_bindir}/kwrite
791 784
 %{tde_tdelibdir}/kwrite.la
792 785
 %{tde_tdelibdir}/kwrite.so
793
-%{tde_libdir}/lib[kt]deinit_kwrite.la
794
-%{tde_libdir}/lib[kt]deinit_kwrite.so
786
+%{tde_libdir}/libtdeinit_kwrite.la
787
+%{tde_libdir}/libtdeinit_kwrite.so
795 788
 %{tde_tdeappdir}/kwrite.desktop
796 789
 %{tde_datadir}/apps/kwrite/kwriteui.rc
797 790
 %{tde_datadir}/icons/hicolor/*/apps/kwrite.png
@@ -895,8 +888,8 @@ plugdev group.
895 888
 %{tde_tdelibdir}/kcm_joystick.so
896 889
 %{tde_tdelibdir}/kcm_kded.la
897 890
 %{tde_tdelibdir}/kcm_kded.so
898
-%{tde_tdelibdir}/kcm_[kt]dm.la
899
-%{tde_tdelibdir}/kcm_[kt]dm.so
891
+%{tde_tdelibdir}/kcm_tdm.la
892
+%{tde_tdelibdir}/kcm_tdm.so
900 893
 %{tde_tdelibdir}/kcm_tdednssd.so
901 894
 %{tde_tdelibdir}/kcm_tdednssd.la
902 895
 %{tde_tdelibdir}/kcm_keys.la
@@ -959,10 +952,10 @@ plugdev group.
959 952
 %{tde_tdelibdir}/libkurisearchfilter.so
960 953
 %{tde_tdelibdir}/liblocaldomainurifilter.la
961 954
 %{tde_tdelibdir}/liblocaldomainurifilter.so
962
-%{tde_libdir}/lib[kt]deinit_kaccess.la
963
-%{tde_libdir}/lib[kt]deinit_kaccess.so
964
-%{tde_libdir}/lib[kt]deinit_kcontrol.la
965
-%{tde_libdir}/lib[kt]deinit_kcontrol.so
955
+%{tde_libdir}/libtdeinit_kaccess.la
956
+%{tde_libdir}/libtdeinit_kaccess.so
957
+%{tde_libdir}/libtdeinit_kcontrol.la
958
+%{tde_libdir}/libtdeinit_kcontrol.so
966 959
 %{tde_libdir}/libtdefontinst.so.*
967 960
 %{tde_tdeappdir}/arts.desktop
968 961
 %{tde_tdeappdir}/background.desktop
@@ -1004,7 +997,7 @@ plugdev group.
1004 997
 %{tde_tdeappdir}/kcmusb.desktop
1005 998
 %{tde_tdeappdir}/kcmview1394.desktop
1006 999
 %{tde_tdeappdir}/KControl.desktop
1007
-%{tde_tdeappdir}/[kt]dm.desktop
1000
+%{tde_tdeappdir}/tdm.desktop
1008 1001
 %{tde_tdeappdir}/keys.desktop
1009 1002
 %{tde_tdeappdir}/tdefontview.desktop
1010 1003
 %{tde_tdeappdir}/tdehtml_behavior.desktop
@@ -1135,7 +1128,7 @@ TDE applications, particularly those in the TDE base module.
1135 1128
 %{tde_bindir}/krootbacking
1136 1129
 #%{tde_bindir}/tdeinit_phase1
1137 1130
 %if 0%{?with_tsak}
1138
-%attr(4511,root,root) %{tde_bindir}/[kt]dmtsak
1131
+%attr(4511,root,root) %{tde_bindir}/tdmtsak
1139 1132
 %{tde_bindir}/tsak
1140 1133
 %endif
1141 1134
 %{tde_bindir}/kdebugdialog
@@ -1151,8 +1144,8 @@ TDE applications, particularly those in the TDE base module.
1151 1144
 %{tde_bindir}/kcminit
1152 1145
 %{tde_bindir}/kcminit_startup
1153 1146
 %{tde_bindir}/kdcop
1154
-%{tde_bindir}/[kt]desu
1155
-%attr(0755,root,root) %{tde_bindir}/[kt]desud
1147
+%{tde_bindir}/tdesu
1148
+%attr(0755,root,root) %{tde_bindir}/tdesud
1156 1149
 %{tde_bindir}/kdialog
1157 1150
 %{tde_bindir}/khotkeys
1158 1151
 %{tde_bindir}/knetattach
@@ -1182,14 +1175,14 @@ TDE applications, particularly those in the TDE base module.
1182 1175
 %{tde_tdelibdir}/khotkeys_arts.so
1183 1176
 %{tde_tdelibdir}/kxkb.la
1184 1177
 %{tde_tdelibdir}/kxkb.so
1185
-%{tde_libdir}/lib[kt]deinit_kcminit.la
1186
-%{tde_libdir}/lib[kt]deinit_kcminit.so
1187
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.la
1188
-%{tde_libdir}/lib[kt]deinit_kcminit_startup.so
1189
-%{tde_libdir}/lib[kt]deinit_khotkeys.la
1190
-%{tde_libdir}/lib[kt]deinit_khotkeys.so
1191
-%{tde_libdir}/lib[kt]deinit_kxkb.la
1192
-%{tde_libdir}/lib[kt]deinit_kxkb.so
1178
+%{tde_libdir}/libtdeinit_kcminit.la
1179
+%{tde_libdir}/libtdeinit_kcminit.so
1180
+%{tde_libdir}/libtdeinit_kcminit_startup.la
1181
+%{tde_libdir}/libtdeinit_kcminit_startup.so
1182
+%{tde_libdir}/libtdeinit_khotkeys.la
1183
+%{tde_libdir}/libtdeinit_khotkeys.so
1184
+%{tde_libdir}/libtdeinit_kxkb.la
1185
+%{tde_libdir}/libtdeinit_kxkb.so
1193 1186
 %{tde_libdir}/libkhotkeys_shared.so.*
1194 1187
 %{tde_tdeappdir}/keyboard.desktop
1195 1188
 %{tde_tdeappdir}/keyboard_layout.desktop
@@ -1210,7 +1203,7 @@ TDE applications, particularly those in the TDE base module.
1210 1203
 %endif
1211 1204
 %{tde_tdedocdir}/HTML/en/kdcop/
1212 1205
 %{tde_tdedocdir}/HTML/en/kdebugdialog//
1213
-%{tde_tdedocdir}/HTML/en/[kt]desu/
1206
+%{tde_tdedocdir}/HTML/en/tdesu/
1214 1207
 %{tde_tdedocdir}/HTML/en/knetattach/
1215 1208
 %{tde_tdedocdir}/HTML/en/kxkb/
1216 1209
 
@@ -1318,7 +1311,7 @@ needed for a basic TDE desktop installation.
1318 1311
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
1319 1312
 %{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
1320 1313
 %{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
1321
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]dmconfig.png
1314
+%{tde_datadir}/icons/crystalsvg/*/apps/tdmconfig.png
1322 1315
 %{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
1323 1316
 %{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
1324 1317
 %{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
@@ -1517,18 +1510,11 @@ needed for a basic TDE desktop installation.
1517 1510
 %exclude %{tde_datadir}/sounds/pop.wav
1518 1511
 %{tde_datadir}/sounds/
1519 1512
 %{tde_datadir}/wallpapers/*
1520
-
1521
-%if "%{tde_prefix}" != "/usr"
1522
-%{tde_prefix}/etc/xdg/menus/applications-merged/tde-essential.menu
1523
-%{tde_prefix}/etc/xdg/menus/tde-information.menu
1524
-%{tde_prefix}/etc/xdg/menus/tde-screensavers.menu
1525
-%{tde_prefix}/etc/xdg/menus/tde-settings.menu
1526
-%else
1513
+# XDG directories information
1527 1514
 %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
1528 1515
 %{_sysconfdir}/xdg/menus/tde-information.menu
1529 1516
 %{_sysconfdir}/xdg/menus/tde-screensavers.menu
1530 1517
 %{_sysconfdir}/xdg/menus/tde-settings.menu
1531
-%endif
1532 1518
 
1533 1519
 %{tde_tdedocdir}/HTML/en/kcontrol/
1534 1520
 %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
@@ -1753,11 +1739,11 @@ system passwords.
1753 1739
 %{tde_tdelibdir}/kcm_useraccount.so
1754 1740
 %{tde_tdeappdir}/kcm_useraccount.desktop
1755 1741
 %{tde_tdeappdir}/kdepasswd.desktop
1756
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default1.png
1757
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default2.png
1758
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/default3.png
1759
-%exclude %{tde_datadir}/apps/[kt]dm/pics/users/root1.png
1760
-%{tde_datadir}/apps/[kt]dm/pics/users/*.png
1742
+%exclude %{tde_datadir}/apps/tdm/pics/users/default1.png
1743
+%exclude %{tde_datadir}/apps/tdm/pics/users/default2.png
1744
+%exclude %{tde_datadir}/apps/tdm/pics/users/default3.png
1745
+%exclude %{tde_datadir}/apps/tdm/pics/users/root1.png
1746
+%{tde_datadir}/apps/tdm/pics/users/*.png
1761 1747
 %{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
1762 1748
 %{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
1763 1749
 
@@ -1784,7 +1770,7 @@ Installation of smbclient will make you able to use smb shared printers.
1784 1770
 
1785 1771
 %files -n trinity-tdeprint
1786 1772
 %defattr(-,root,root,-)
1787
-%{tde_bindir}/[kt]deprintfax
1773
+%{tde_bindir}/tdeprintfax
1788 1774
 %{tde_bindir}/kjobviewer
1789 1775
 %{tde_bindir}/kprinter
1790 1776
 %{tde_tdelibdir}/kcm_printmgr.la
@@ -1795,19 +1781,19 @@ Installation of smbclient will make you able to use smb shared printers.
1795 1781
 %{tde_tdelibdir}/kjobviewer.so
1796 1782
 %{tde_tdelibdir}/kprinter.la
1797 1783
 %{tde_tdelibdir}/kprinter.so
1798
-%{tde_tdelibdir}/lib[kt]deprint_part.la
1799
-%{tde_tdelibdir}/lib[kt]deprint_part.so
1800
-%{tde_libdir}/lib[kt]deinit_kjobviewer.la
1801
-%{tde_libdir}/lib[kt]deinit_kjobviewer.so
1802
-%{tde_libdir}/lib[kt]deinit_kprinter.la
1803
-%{tde_libdir}/lib[kt]deinit_kprinter.so
1804
-%{tde_tdeappdir}/[kt]deprintfax.desktop
1805
-%{tde_tdeappdir}/[kt]jobviewer.desktop
1784
+%{tde_tdelibdir}/libtdeprint_part.la
1785
+%{tde_tdelibdir}/libtdeprint_part.so
1786
+%{tde_libdir}/libtdeinit_kjobviewer.la
1787
+%{tde_libdir}/libtdeinit_kjobviewer.so
1788
+%{tde_libdir}/libtdeinit_kprinter.la
1789
+%{tde_libdir}/libtdeinit_kprinter.so
1790
+%{tde_tdeappdir}/tdeprintfax.desktop
1791
+%{tde_tdeappdir}/kjobviewer.desktop
1806 1792
 %{tde_tdeappdir}/printers.desktop
1807
-%{tde_datadir}/apps/[kt]deprint/
1808
-%{tde_datadir}/apps/[kt]deprintfax/
1809
-%{tde_datadir}/apps/[kt]jobviewer/
1810
-%{tde_datadir}/apps/[kt]deprint_part/tdeprint_part.rc
1793
+%{tde_datadir}/apps/tdeprint/
1794
+%{tde_datadir}/apps/tdeprintfax/
1795
+%{tde_datadir}/apps/kjobviewer/
1796
+%{tde_datadir}/apps/tdeprint_part/tdeprint_part.rc
1811 1797
 %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png
1812 1798
 %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
1813 1799
 %{tde_datadir}/icons/hicolor/*/apps/printmgr.png
@@ -1824,7 +1810,7 @@ Installation of smbclient will make you able to use smb shared printers.
1824 1810
 %{tde_datadir}/services/tdeprint_part.desktop
1825 1811
 %{tde_datadir}/services/print.protocol
1826 1812
 %{tde_datadir}/services/printdb.protocol
1827
-%{tde_tdedocdir}/HTML/en/[kt]deprint/
1813
+%{tde_tdedocdir}/HTML/en/tdeprint/
1828 1814
 
1829 1815
 %post -n trinity-tdeprint
1830 1816
 /sbin/ldconfig || :
@@ -1871,8 +1857,8 @@ the TDE desktop.
1871 1857
 %{tde_bindir}/kwebdesktop
1872 1858
 %{tde_tdelibdir}/kdesktop.la
1873 1859
 %{tde_tdelibdir}/kdesktop.so
1874
-%{tde_libdir}/lib[kt]deinit_kdesktop.la
1875
-%{tde_libdir}/lib[kt]deinit_kdesktop.so
1860
+%{tde_libdir}/libtdeinit_kdesktop.la
1861
+%{tde_libdir}/libtdeinit_kdesktop.so
1876 1862
 %{tde_datadir}/apps/kdesktop/
1877 1863
 %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
1878 1864
 %{tde_datadir}/autostart/kdesktop.desktop
@@ -1963,23 +1949,23 @@ already. Most users won't need this.
1963 1949
 %defattr(-,root,root,-)
1964 1950
 %{tde_tdelibdir}/kgreet_pam.la
1965 1951
 %{tde_tdelibdir}/kgreet_pam.so
1966
-%{tde_bindir}/gen[kt]dmconf
1967
-%{tde_bindir}/[kt]dm
1968
-%{tde_bindir}/[kt]dm_config
1969
-%{tde_bindir}/[kt]dmctl
1970
-%{tde_bindir}/[kt]dm_greet
1952
+%{tde_bindir}/gentdmconf
1953
+%{tde_bindir}/tdm
1954
+%{tde_bindir}/tdm_config
1955
+%{tde_bindir}/tdmctl
1956
+%{tde_bindir}/tdm_greet
1971 1957
 %{tde_bindir}/krootimage
1972
-%{tde_datadir}/apps/[kt]dm/pics/kdelogo.png
1973
-%{tde_datadir}/apps/[kt]dm/pics/shutdown.jpg
1974
-%{tde_datadir}/apps/[kt]dm/pics/users/default1.png
1975
-%{tde_datadir}/apps/[kt]dm/pics/users/default2.png
1976
-%{tde_datadir}/apps/[kt]dm/pics/users/default3.png
1977
-%{tde_datadir}/apps/[kt]dm/pics/users/root1.png
1978
-%{tde_datadir}/apps/[kt]dm/sessions/*.desktop
1979
-%{tde_datadir}/apps/[kt]dm/themes/
1958
+%{tde_datadir}/apps/tdm/pics/kdelogo.png
1959
+%{tde_datadir}/apps/tdm/pics/shutdown.jpg
1960
+%{tde_datadir}/apps/tdm/pics/users/default1.png
1961
+%{tde_datadir}/apps/tdm/pics/users/default2.png
1962
+%{tde_datadir}/apps/tdm/pics/users/default3.png
1963
+%{tde_datadir}/apps/tdm/pics/users/root1.png
1964
+%{tde_datadir}/apps/tdm/sessions/*.desktop
1965
+%{tde_datadir}/apps/tdm/themes/
1980 1966
 %{tde_datadir}/config/tdm
1981
-%{_sysconfdir}/trinity/[kt]dm/
1982
-%{tde_tdedocdir}/HTML/en/[kt]dm/
1967
+%{_sysconfdir}/trinity/tdm/
1968
+%{tde_tdedocdir}/HTML/en/tdm/
1983 1969
 %if 0%{?suse_version} == 0
1984 1970
 %{_sysconfdir}/pam.d/tdm-trinity
1985 1971
 %{_sysconfdir}/pam.d/tdm-trinity-np
@@ -2126,8 +2112,8 @@ documentation.
2126 2112
 %{tde_bindir}/khelpcenter
2127 2113
 %{tde_tdelibdir}/khelpcenter.la
2128 2114
 %{tde_tdelibdir}/khelpcenter.so
2129
-%{tde_libdir}/lib[kt]deinit_khelpcenter.la
2130
-%{tde_libdir}/lib[kt]deinit_khelpcenter.so
2115
+%{tde_libdir}/libtdeinit_khelpcenter.la
2116
+%{tde_libdir}/libtdeinit_khelpcenter.so
2131 2117
 %{tde_tdeappdir}/Help.desktop
2132 2118
 %{tde_datadir}/apps/khelpcenter/
2133 2119
 %{tde_datadir}/config.kcfg/khelpcenter.kcfg
@@ -2185,8 +2171,8 @@ functionality.
2185 2171
 %{tde_tdelibdir}/kickermenu_find.so
2186 2172
 %{tde_tdelibdir}/kickermenu_kate.so
2187 2173
 %{tde_tdelibdir}/kickermenu_kate.la
2188
-%{tde_tdelibdir}/kickermenu_[kt]deprint.la
2189
-%{tde_tdelibdir}/kickermenu_[kt]deprint.so
2174
+%{tde_tdelibdir}/kickermenu_tdeprint.la
2175
+%{tde_tdelibdir}/kickermenu_tdeprint.so
2190 2176
 %{tde_tdelibdir}/kickermenu_konqueror.la
2191 2177
 %{tde_tdelibdir}/kickermenu_konqueror.so
2192 2178
 %{tde_tdelibdir}/kickermenu_konsole.la
@@ -2225,12 +2211,12 @@ functionality.
2225 2211
 %{tde_tdelibdir}/trash_panelapplet.la
2226 2212
 %{tde_tdelibdir}/trash_panelapplet.so
2227 2213
 %{tde_libdir}/libkasbar.so.*
2228
-%{tde_libdir}/lib[kt]deinit_appletproxy.la
2229
-%{tde_libdir}/lib[kt]deinit_appletproxy.so
2230
-%{tde_libdir}/lib[kt]deinit_extensionproxy.la
2231
-%{tde_libdir}/lib[kt]deinit_extensionproxy.so
2232
-%{tde_libdir}/lib[kt]deinit_kicker.la
2233
-%{tde_libdir}/lib[kt]deinit_kicker.so
2214
+%{tde_libdir}/libtdeinit_appletproxy.la
2215
+%{tde_libdir}/libtdeinit_appletproxy.so
2216
+%{tde_libdir}/libtdeinit_extensionproxy.la
2217
+%{tde_libdir}/libtdeinit_extensionproxy.so
2218
+%{tde_libdir}/libtdeinit_kicker.la
2219
+%{tde_libdir}/libtdeinit_kicker.so
2234 2220
 %{tde_libdir}/libkickermain.so.*
2235 2221
 %{tde_libdir}/libtaskbar.so.*
2236 2222
 %{tde_libdir}/libtaskmanager.so.*
@@ -2338,8 +2324,8 @@ web browser if the clipboard contains a URL.
2338 2324
 %{tde_tdelibdir}/klipper.so
2339 2325
 %{tde_tdelibdir}/klipper_panelapplet.la
2340 2326
 %{tde_tdelibdir}/klipper_panelapplet.so
2341
-%{tde_libdir}/lib[kt]deinit_klipper.la
2342
-%{tde_libdir}/lib[kt]deinit_klipper.so
2327
+%{tde_libdir}/libtdeinit_klipper.la
2328
+%{tde_libdir}/libtdeinit_klipper.so
2343 2329
 %{tde_tdeappdir}/klipper.desktop
2344 2330
 %{tde_datadir}/apps/tdeconf_update/klipper-1-2.pl
2345 2331
 %{tde_datadir}/apps/tdeconf_update/klipper-trinity1.sh
@@ -2385,10 +2371,10 @@ structure.
2385 2371
 %{tde_tdelibdir}/kcontroledit.so
2386 2372
 %{tde_tdelibdir}/kmenuedit.la
2387 2373
 %{tde_tdelibdir}/kmenuedit.so
2388
-%{tde_libdir}/lib[kt]deinit_kcontroledit.la
2389
-%{tde_libdir}/lib[kt]deinit_kcontroledit.so
2390
-%{tde_libdir}/lib[kt]deinit_kmenuedit.la
2391
-%{tde_libdir}/lib[kt]deinit_kmenuedit.so
2374
+%{tde_libdir}/libtdeinit_kcontroledit.la
2375
+%{tde_libdir}/libtdeinit_kcontroledit.so
2376
+%{tde_libdir}/libtdeinit_kmenuedit.la
2377
+%{tde_libdir}/libtdeinit_kmenuedit.so
2392 2378
 %{tde_tdeappdir}/kmenuedit.desktop
2393 2379
 %{tde_datadir}/applnk/System/kmenuedit.desktop
2394 2380
 %{tde_datadir}/apps/kcontroledit/
@@ -2475,12 +2461,12 @@ ever launching another application.
2475 2461
 %{tde_tdelibdir}/konqueror.so
2476 2462
 %{tde_tdelibdir}/libtdehtmlkttsdplugin.la
2477 2463
 %{tde_tdelibdir}/libtdehtmlkttsdplugin.so
2478
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.la
2479
-%{tde_libdir}/lib[kt]deinit_keditbookmarks.so
2480
-%{tde_libdir}/lib[kt]deinit_kfmclient.la
2481
-%{tde_libdir}/lib[kt]deinit_kfmclient.so
2482
-%{tde_libdir}/lib[kt]deinit_konqueror.la
2483
-%{tde_libdir}/lib[kt]deinit_konqueror.so
2464
+%{tde_libdir}/libtdeinit_keditbookmarks.la
2465
+%{tde_libdir}/libtdeinit_keditbookmarks.so
2466
+%{tde_libdir}/libtdeinit_kfmclient.la
2467
+%{tde_libdir}/libtdeinit_kfmclient.so
2468
+%{tde_libdir}/libtdeinit_konqueror.la
2469
+%{tde_libdir}/libtdeinit_konqueror.so
2484 2470
 %{tde_libdir}/libkonqsidebarplugin.so.*
2485 2471
 %{tde_tdeappdir}/Home.desktop
2486 2472
 %{tde_tdeappdir}/kcmhistory.desktop
@@ -2646,8 +2632,8 @@ Using Konsole, a user can open:
2646 2632
 %{tde_tdelibdir}/konsole.so
2647 2633
 %{tde_tdelibdir}/libkonsolepart.la
2648 2634
 %{tde_tdelibdir}/libkonsolepart.so
2649
-%{tde_libdir}/lib[kt]deinit_konsole.la
2650
-%{tde_libdir}/lib[kt]deinit_konsole.so
2635
+%{tde_libdir}/libtdeinit_konsole.la
2636
+%{tde_libdir}/libtdeinit_konsole.so
2651 2637
 %{tde_tdeappdir}/konsole.desktop
2652 2638
 %{tde_tdeappdir}/konsolesu.desktop
2653 2639
 %{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
@@ -2772,25 +2758,20 @@ TDE will start, but many good defaults will not be set.
2772 2758
 %files -n trinity-ksmserver
2773 2759
 %defattr(-,root,root,-)
2774 2760
 %{tde_bindir}/ksmserver
2775
-%{tde_bindir}/start[kt]de
2761
+%{tde_bindir}/starttde
2776 2762
 %{tde_bindir}/migratekde3
2777 2763
 %{tde_bindir}/r14-xdg-update
2778 2764
 %{tde_bindir}/tdeinit_displayconfig
2779 2765
 %{tde_bindir}/tdeinit_phase1
2780 2766
 %{tde_tdelibdir}/ksmserver.la
2781 2767
 %{tde_tdelibdir}/ksmserver.so
2782
-%{tde_libdir}/lib[kt]deinit_ksmserver.la
2783
-%{tde_libdir}/lib[kt]deinit_ksmserver.so
2768
+%{tde_libdir}/libtdeinit_ksmserver.la
2769
+%{tde_libdir}/libtdeinit_ksmserver.so
2784 2770
 %{tde_datadir}/apps/tdeconf_update/ksmserver.upd
2785 2771
 %{tde_datadir}/apps/tdeconf_update/move_session_config.sh
2786 2772
 %{tde_datadir}/apps/ksmserver/pics/shutdown.png
2787 2773
 %{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
2788 2774
 
2789
-# Remove conflicts with redhat-menus
2790
-%if "%{?tde_prefix}" != "/usr"
2791
-%{tde_bindir}/plasma-desktop
2792
-%endif
2793
-
2794 2775
 %post -n trinity-ksmserver
2795 2776
 /sbin/ldconfig || :
2796 2777
 
@@ -2991,45 +2972,45 @@ This package contains the default X window manager for TDE.
2991 2972
 %files -n trinity-twin
2992 2973
 %defattr(-,root,root,-)
2993 2974
 %{tde_bindir}/kompmgr
2994
-%{tde_bindir}/[kt]win
2995
-%{tde_bindir}/[kt]win_killer_helper
2996
-%{tde_bindir}/[kt]win_resumer_helper
2997
-%{tde_bindir}/[kt]win_rules_dialog
2998
-%{tde_libdir}/tdeconf_update_bin/[kt]win_update_default_rules
2999
-%{tde_libdir}/tdeconf_update_bin/[kt]win_update_window_settings
3000
-%{tde_tdelibdir}/kcm_[kt]win*.la
3001
-%{tde_tdelibdir}/kcm_[kt]win*.so
3002
-%{tde_tdelibdir}/[kt]win*.la
3003
-%{tde_tdelibdir}/[kt]win*.so
3004
-%{tde_libdir}/lib[kt]decorations.so.*
3005
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.la
3006
-%{tde_libdir}/lib[kt]deinit_[kt]win_rules_dialog.so
3007
-%{tde_libdir}/lib[kt]deinit_[kt]win.la
3008
-%{tde_libdir}/lib[kt]deinit_[kt]win.so
2975
+%{tde_bindir}/twin
2976
+%{tde_bindir}/twin_killer_helper
2977
+%{tde_bindir}/twin_resumer_helper
2978
+%{tde_bindir}/twin_rules_dialog
2979
+%{tde_libdir}/tdeconf_update_bin/twin_update_default_rules
2980
+%{tde_libdir}/tdeconf_update_bin/twin_update_window_settings
2981
+%{tde_tdelibdir}/kcm_twin*.la
2982
+%{tde_tdelibdir}/kcm_twin*.so
2983
+%{tde_tdelibdir}/twin*.la
2984
+%{tde_tdelibdir}/twin*.so
2985
+%{tde_libdir}/libtdecorations.so.*
2986
+%{tde_libdir}/libtdeinit_twin_rules_dialog.la
2987
+%{tde_libdir}/libtdeinit_twin_rules_dialog.so
2988
+%{tde_libdir}/libtdeinit_twin.la
2989
+%{tde_libdir}/libtdeinit_twin.so
3009 2990
 %{tde_tdeappdir}/showdesktop.desktop
3010
-%{tde_tdeappdir}/[kt]windecoration.desktop
3011
-%{tde_tdeappdir}/[kt]winoptions.desktop
3012
-%{tde_tdeappdir}/[kt]winrules.desktop
3013
-%{tde_datadir}/applnk/.hidden/[kt]winactions.desktop
3014
-%{tde_datadir}/applnk/.hidden/[kt]winadvanced.desktop
3015
-%{tde_datadir}/applnk/.hidden/[kt]winfocus.desktop
3016
-%{tde_datadir}/applnk/.hidden/[kt]winmoving.desktop
3017
-%{tde_datadir}/applnk/.hidden/[kt]wintranslucency.desktop
3018
-%{tde_datadir}/apps/tdeconf_update/[kt]win3_plugin.pl
3019
-%{tde_datadir}/apps/tdeconf_update/[kt]win3_plugin.upd
3020
-%{tde_datadir}/apps/tdeconf_update/[kt]win_focus1.sh
3021
-%{tde_datadir}/apps/tdeconf_update/[kt]win_focus1.upd
3022
-%{tde_datadir}/apps/tdeconf_update/[kt]win_focus2.sh
3023
-%{tde_datadir}/apps/tdeconf_update/[kt]win_focus2.upd
3024
-%{tde_datadir}/apps/tdeconf_update/[kt]win_fsp_workarounds_1.upd
3025
-%{tde_datadir}/apps/tdeconf_update/[kt]winiconify.upd
3026
-%{tde_datadir}/apps/tdeconf_update/[kt]winsticky.upd
3027
-%{tde_datadir}/apps/tdeconf_update/[kt]win.upd
3028
-%{tde_datadir}/apps/tdeconf_update/[kt]winupdatewindowsettings.upd
2991
+%{tde_tdeappdir}/twindecoration.desktop
2992
+%{tde_tdeappdir}/twinoptions.desktop
2993
+%{tde_tdeappdir}/twinrules.desktop
2994
+%{tde_datadir}/applnk/.hidden/twinactions.desktop
2995
+%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
2996
+%{tde_datadir}/applnk/.hidden/twinfocus.desktop
2997
+%{tde_datadir}/applnk/.hidden/twinmoving.desktop
2998
+%{tde_datadir}/applnk/.hidden/twintranslucency.desktop
2999
+%{tde_datadir}/apps/tdeconf_update/twin3_plugin.pl
3000
+%{tde_datadir}/apps/tdeconf_update/twin3_plugin.upd
3001
+%{tde_datadir}/apps/tdeconf_update/twin_focus1.sh
3002
+%{tde_datadir}/apps/tdeconf_update/twin_focus1.upd
3003
+%{tde_datadir}/apps/tdeconf_update/twin_focus2.sh
3004
+%{tde_datadir}/apps/tdeconf_update/twin_focus2.upd
3005
+%{tde_datadir}/apps/tdeconf_update/twin_fsp_workarounds_1.upd
3006
+%{tde_datadir}/apps/tdeconf_update/twiniconify.upd
3007
+%{tde_datadir}/apps/tdeconf_update/twinsticky.upd
3008
+%{tde_datadir}/apps/tdeconf_update/twin.upd
3009
+%{tde_datadir}/apps/tdeconf_update/twinupdatewindowsettings.upd
3029 3010
 %{tde_datadir}/apps/tdeconf_update/pluginlibFix.pl
3030
-%{tde_datadir}/apps/[kt]win/
3031
-%{tde_datadir}/config.kcfg/[kt]win.kcfg
3032
-%{tde_datadir}/icons/crystalsvg/*/apps/[kt]win.png
3011
+%{tde_datadir}/apps/twin/
3012
+%{tde_datadir}/config.kcfg/twin.kcfg
3013
+%{tde_datadir}/icons/crystalsvg/*/apps/twin.png
3033 3014
 %{tde_tdedocdir}/HTML/en/kompmgr/
3034 3015
 
3035 3016
 %post -n trinity-twin
@@ -3060,7 +3041,7 @@ Requires:	trinity-twin = %{version}-%{release}
3060 3041
 
3061 3042
 %files -n trinity-twin-devel
3062 3043
 %defattr(-,root,root,-)
3063
-%{tde_tdeincludedir}/[kt]win/
3044
+%{tde_tdeincludedir}/twin/
3064 3045
 %{tde_tdeincludedir}/kcommondecoration.h
3065 3046
 %{tde_tdeincludedir}/kdecoration.h
3066 3047
 %{tde_tdeincludedir}/kdecoration_p.h
@@ -3191,6 +3172,7 @@ Windows and Samba shares.
3191 3172
 
3192 3173
 %prep
3193 3174
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
3175
+%patch0 -p1 -b .ftbfs
3194 3176
 
3195 3177
 
3196 3178
 # Applies an optional distro-specific graphical theme
@@ -3346,11 +3328,6 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
3346 3328
 EOF
3347 3329
 %endif
3348 3330
 
3349
-# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
3350
-%if "%{?tde_prefix}" != "/usr"
3351
-%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
3352
-%endif
3353
-
3354 3331
 # PAM configuration files (except openSUSE)
3355 3332
 %if 0%{?suse_version} == 0
3356 3333
 %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
@@ -3367,12 +3344,6 @@ EOF
3367 3344
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
3368 3345
 %endif
3369 3346
 
3370
-# Moves the XDG configuration files to TDE directory
3371
-%if "%{tde_prefix}" != "/usr"
3372
-%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
3373
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
3374
-%endif
3375
-
3376 3347
 # Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
3377 3348
 %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
3378 3349
 %if 0%{?suse_version} 
@@ -3419,5 +3390,5 @@ EOF
3419 3390
 
3420 3391
 
3421 3392
 %changelog
3422
-* Sun Mar 04 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
3423
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
3393
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
3394
+- Initial build for TDE 14.0.0

+ 2990
- 0
redhat/tdelibs/tdelibs-14.0.0-fix_xdg_menu.patch
File diff suppressed because it is too large
View File


+ 44
- 0
redhat/tdelibs/tdelibs-14.0.0-ftbfs.patch View File

@@ -0,0 +1,44 @@
1
+--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/CMakeLists.txt.ftbfs	2013-07-16 15:59:42.000000000 +0200
2
++++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/CMakeLists.txt	2013-07-17 14:39:37.553649801 +0200
3
+@@ -83,6 +83,7 @@
4
+   ${TQT_LIBRARY_DIRS}
5
+   ${LIBIDN_LIBRARY_DIRS}
6
+   ${GAMIN_LIBDIR}
7
++  ${LIBART_LIBRARY_DIRS}
8
+ )
9
+ 
10
+ ##### headers ###################################
11
+--- trinity-tdelibs-14.0.0~pre599+bae79307/pics/CMakeLists.txt.ORI	2013-07-17 14:56:14.633297689 +0200
12
++++ trinity-tdelibs-14.0.0~pre599+bae79307/pics/CMakeLists.txt	2013-07-17 14:56:25.145239757 +0200
13
+@@ -28,6 +28,7 @@
14
+ 
15
+ link_directories(
16
+   ${TQT_LIBRARY_DIRS}
17
++  ${LIBART_LIBRARY_DIRS}
18
+ )
19
+ 
20
+ 
21
+--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.h.ORI	2013-07-17 14:47:03.918290078 +0200
22
++++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.h	2013-07-17 14:47:22.080194401 +0200
23
+@@ -27,7 +27,9 @@
24
+ #include "tdelibs_export.h"
25
+ 
26
+ // udev includes
27
++extern "C" {
28
+ #include <libudev.h>
29
++}
30
+ #include <stdio.h>
31
+ #include <stdlib.h>
32
+ #include <locale.h>
33
+--- trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.cpp.ORI	2013-07-17 14:47:29.718154173 +0200
34
++++ trinity-tdelibs-14.0.0~pre599+bae79307/tdecore/tdehardwaredevices.cpp	2013-07-17 14:47:47.204062091 +0200
35
+@@ -33,7 +33,9 @@
36
+ #include <tdeapplication.h>
37
+ #include <dcopclient.h>
38
+ 
39
++extern "C" {
40
+ #include <libudev.h>
41
++}
42
+ 
43
+ #include <fcntl.h>
44
+ #include <poll.h>

+ 48
- 38
redhat/tdelibs/tdelibs-14.0.0.spec View File

@@ -3,6 +3,8 @@
3 3
 %define _variant .opt
4 4
 %endif
5 5
 
6
+%define tde_version 14.0.0
7
+
6 8
 # TDE specific variables
7 9
 %define tde_bindir %{tde_prefix}/bin
8 10
 %define tde_datadir %{tde_prefix}/share
@@ -31,7 +33,8 @@ Prefix:		%{tde_prefix}
31 33
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
32 34
 
33 35
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
34
-
36
+Patch0:		tdelibs-14.0.0-ftbfs.patch
37
+Patch1:		tdelibs-14.0.0-fix_xdg_menu.patch
35 38
 
36 39
 Obsoletes:	tdelibs < %{version}-%{release}
37 40
 Provides:	tdelibs = %{version}-%{release}
@@ -44,14 +47,13 @@ Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
44 47
 BuildRequires:	cmake >= 2.8
45 48
 BuildRequires:	libtool
46 49
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
47
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
48
-BuildRequires:	trinity-arts-devel >= %{version}
49
-BuildRequires:	trinity-dbus-1-tqt-devel >= %{version}
50
-BuildRequires:	trinity-dbus-tqt-devel >= %{version}
50
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
51
+BuildRequires:	trinity-arts-devel >= %{tde_version}
52
+BuildRequires:	trinity-dbus-1-tqt-devel >= %{tde_version}
53
+BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
51 54
 BuildRequires:	krb5-devel
52 55
 BuildRequires:	libxslt-devel
53 56
 BuildRequires:	cups-devel
54
-BuildRequires:	trinity-libart-lgpl-devel
55 57
 BuildRequires:	openssl-devel
56 58
 BuildRequires:	gcc-c++
57 59
 BuildRequires:	alsa-lib-devel
@@ -61,6 +63,9 @@ BuildRequires:	glib2-devel
61 63
 # LUA support are not ready yet
62 64
 #BuildRequires:	lua-devel
63 65
 
66
+# LIBART_LGPL support
67
+BuildRequires:	trinity-libart-lgpl-devel
68
+
64 69
 # ASPELL support
65 70
 BuildRequires:	aspell
66 71
 BuildRequires:	aspell-devel
@@ -90,6 +95,15 @@ BuildRequires:	libbz2-devel
90 95
 BuildRequires:	bzip2-devel
91 96
 %endif
92 97
 
98
+# UDEV support
99
+BuildRequires:	libudev-devel
100
+
101
+# UDISKS2 support
102
+BuildRequires:	udisks-devel
103
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
104
+%define with_udisks2 1
105
+%endif
106
+
93 107
 # UTEMPTER support
94 108
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
95 109
 BuildRequires:	libutempter-devel
@@ -124,7 +138,7 @@ BuildRequires:	jasper-devel
124 138
 # AVAHI support
125 139
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
126 140
 %define with_avahi 1
127
-BuildRequires:	trinity-avahi-tqt-devel >= %{version}
141
+BuildRequires:	trinity-avahi-tqt-devel >= %{tde_version}
128 142
 %if 0%{?mgaversion} || 0%{?mdkversion}
129 143
 BuildRequires:	%{_lib}avahi-client-devel
130 144
 Requires:		%{_lib}avahi-client3
@@ -195,11 +209,14 @@ BuildRequires:	xz-devel
195 209
 %if 0%{?mgaversion} || 0%{?mdkversion}
196 210
 BuildRequires:	%{_lib}nm-util-devel
197 211
 %endif
212
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
213
+BuildRequires:	NetworkManager-glib-devel
214
+%endif
198 215
 %endif
199 216
 
200 217
 Requires:		trinity-tqt3 >= 3.5.0
201
-Requires:		trinity-tqtinterface >= %{version}
202
-Requires:		trinity-arts >= %{version}
218
+Requires:		trinity-tqtinterface >= %{tde_version}
219
+Requires:		trinity-arts >= %{tde_version}
203 220
 
204 221
 %description
205 222
 Libraries for the Trinity Desktop Environment:
@@ -232,13 +249,13 @@ kimgio (image manipulation).
232 249
 %{tde_bindir}/tdecmshell
233 250
 %{tde_bindir}/tdeconf_update
234 251
 %{tde_bindir}/kcookiejar
235
-%{tde_bindir}/[kt]de-config
236
-%{tde_bindir}/[kt]de-menu
252
+%{tde_bindir}/tde-config
253
+%{tde_bindir}/tde-menu
237 254
 %{tde_bindir}/kded
238
-%{tde_bindir}/[kt]deinit
239
-%{tde_bindir}/[kt]deinit_shutdown
240
-%{tde_bindir}/[kt]deinit_wrapper
241
-%{tde_bindir}/[kt]desu_stub
255
+%{tde_bindir}/tdeinit
256
+%{tde_bindir}/tdeinit_shutdown
257
+%{tde_bindir}/tdeinit_wrapper
258
+%{tde_bindir}/tdesu_stub
242 259
 %{tde_bindir}/kdetcompmgr
243 260
 %{tde_bindir}/kdontchangethehostname
244 261
 %{tde_bindir}/tdedostartupconfig
@@ -265,8 +282,8 @@ kimgio (image manipulation).
265 282
 %{tde_bindir}/make_driver_db_lpr
266 283
 %{tde_bindir}/meinproc
267 284
 %{tde_bindir}/networkstatustestservice
268
-%{tde_bindir}/start_[kt]deinit
269
-%{tde_bindir}/start_[kt]deinit_wrapper
285
+%{tde_bindir}/start_tdeinit
286
+%{tde_bindir}/start_tdeinit_wrapper
270 287
 %attr(4755,root,root) %{tde_bindir}/kgrantpty
271 288
 %{tde_bindir}/tde_dbus_hardwarecontrol
272 289
 %{tde_bindir}/checkXML
@@ -275,9 +292,9 @@ kimgio (image manipulation).
275 292
 %{tde_bindir}/preparetips
276 293
 %{tde_tdelibdir}/*
277 294
 %{tde_libdir}/lib*.so.*
278
-%{tde_libdir}/lib[kt]deinit_*.la
279
-%{tde_libdir}/lib[kt]deinit_*.so
280
-%{tde_datadir}/applications/[kt]de/*.desktop
295
+%{tde_libdir}/libtdeinit_*.la
296
+%{tde_libdir}/libtdeinit_*.so
297
+%{tde_datadir}/applications/tde/*.desktop
281 298
 %{tde_datadir}/autostart/tdeab2tdeabc.desktop
282 299
 %{tde_datadir}/applnk/tdeio_iso.desktop
283 300
 %{tde_datadir}/apps/*
@@ -296,7 +313,8 @@ kimgio (image manipulation).
296 313
 %{tde_tdedocdir}/HTML/en/tdespell/
297 314
 
298 315
 %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
299
-%{tde_prefix}/etc/xdg/menus/tde-applications.menu
316
+%{_sysconfdir}/xdg/menus/tde-applications.menu
317
+%{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
300 318
 %{_sysconfdir}/ld.so.conf.d/trinity.conf
301 319
 %{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
302 320
 
@@ -333,16 +351,16 @@ applications for TDE.
333 351
 %defattr(-,root,root,-)
334 352
 %{tde_bindir}/dcopidl*
335 353
 %{tde_bindir}/*config_compiler
336
-%{tde_bindir}/make[kt]dewidgets
354
+%{tde_bindir}/maketdewidgets
337 355
 %{tde_datadir}/apps/ksgmltools2/
338 356
 %{tde_tdeincludedir}/*
339 357
 %{tde_libdir}/*.la
340 358
 %{tde_libdir}/*.so
341 359
 %{tde_libdir}/*.a
342 360
 %{tde_libdir}/pkgconfig/tdelibs.pc
343
-%exclude %{tde_libdir}/lib[kt]deinit_*.la
344
-%exclude %{tde_libdir}/lib[kt]deinit_*.so
345
-%{tde_datadir}/cmake/[kt]delibs.cmake
361
+%exclude %{tde_libdir}/libtdeinit_*.la
362
+%exclude %{tde_libdir}/libtdeinit_*.so
363
+%{tde_datadir}/cmake/tdelibs.cmake
346 364
 
347 365
 %post devel
348 366
 /sbin/ldconfig || :
@@ -360,6 +378,8 @@ applications for TDE.
360 378
 
361 379
 %prep
362 380
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
381
+%patch0 -p1 -b .ftbfs
382
+%patch1 -p1 -b .xdg
363 383
 
364 384
 
365 385
 %build
@@ -409,7 +429,7 @@ cd build
409 429
   %{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
410 430
   -DWITH_UPOWER=ON \
411 431
   -DWITH_UDISKS=ON \
412
-  -DWITH_UDISKS2=ON \
432
+  %{?with_udisks2:-DWITH_UDISKS2=ON} %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
413 433
   -DWITH_CONSOLEKIT=ON \
414 434
   %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
415 435
   -DWITH_SUDO_TDESU_BACKEND=OFF \
@@ -433,16 +453,6 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
433 453
 EOF
434 454
 %endif
435 455
 
436
-# Moves the XDG configuration files to TDE directory
437
-%if "%{tde_prefix}" != "/usr"
438
-%__install -p -D -m644 \
439
-  "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
440
-  "%{?buildroot}%{tde_prefix}/etc/xdg/menus/tde-applications.menu"
441
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
442
-%else
443
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/tde-applications.menu"
444
-%endif
445
-
446 456
 # Appends TDE version to '.pc' file
447 457
 echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
448 458
 
@@ -452,5 +462,5 @@ echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
452 462
 
453 463
 
454 464
 %changelog
455
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
456
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
465
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
466
+- Initial build for TDE 14.0.0

Loading…
Cancel
Save