Browse Source

RPM packaging: update for R14

François Andriot 4 years ago
parent
commit
d19d14a031
50 changed files with 2192 additions and 165 deletions
  1. 1
    0
      redhat/.gitignore
  2. 1
    1
      redhat/Makefile.r14
  3. 1
    1
      redhat/applications/kaffeine/kaffeine-14.0.0.spec
  4. 6
    1
      redhat/applications/kpilot/kpilot-14.0.0.spec
  5. 3
    1
      redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
  6. 9
    13
      redhat/applications/tdesvn/tdesvn-14.0.0.spec
  7. 12
    2
      redhat/build/build_rpm_package.sh
  8. 1
    1
      redhat/build/get_installed_package_version.sh
  9. 31
    16
      redhat/build/get_latest_tarball_filename.sh
  10. 34
    25
      redhat/build/get_rpm_package_name.sh
  11. 4
    1
      redhat/build/get_source_files.sh
  12. 1
    1
      redhat/build/get_specfile.sh
  13. 17
    0
      redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
  14. 1
    0
      redhat/dependencies/tqt3/tqt3-14.0.0.spec
  15. 11
    1
      redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
  16. 52
    33
      redhat/extras/akode/akode-14.0.0.spec
  17. 101
    0
      redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec
  18. 138
    0
      redhat/extras/kdevmon/kdevmon-14.0.0.spec
  19. 175
    0
      redhat/extras/kdissert/kdissert-14.0.0.spec
  20. 135
    0
      redhat/extras/kitty/kitty-14.0.0.spec
  21. 163
    0
      redhat/extras/klamav/klamav-14.0.0.spec
  22. 126
    0
      redhat/extras/klibido/klibido-14.0.0.spec
  23. 139
    0
      redhat/extras/kompose/kompose-14.0.0.spec
  24. 142
    0
      redhat/extras/koverartist/koverartist-14.0.0.spec
  25. 142
    0
      redhat/extras/kpacman/kpacman-14.0.0.spec
  26. 4
    4
      redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec
  27. 1
    1
      redhat/main/tdeaddons/tdeaddons-14.0.0.spec
  28. 1
    1
      redhat/main/tdeadmin/tdeadmin-14.0.0.spec
  29. 7
    1
      redhat/main/tdeartwork/tdeartwork-14.0.0.spec
  30. 5
    0
      redhat/main/tdebase/pamd.kcheckpass-trinity.fc21
  31. 16
    0
      redhat/main/tdebase/pamd.kdm-trinity-np.fc21
  32. 19
    0
      redhat/main/tdebase/pamd.kdm-trinity.fc21
  33. 5
    0
      redhat/main/tdebase/pamd.kscreensaver-trinity.fc21
  34. 82
    40
      redhat/main/tdebase/tdebase-14.0.0.spec
  35. BIN
      redhat/main/tdebase/tdm.fc21.pp
  36. 12
    0
      redhat/main/tdebase/tdm.service.fc21
  37. 20
    9
      redhat/main/tdebindings/tdebindings-14.0.0.spec
  38. 1
    1
      redhat/main/tdegames/tdegames-14.0.0.spec
  39. 11
    6
      redhat/main/tdelibs/tdelibs-14.0.0.spec
  40. 6
    1
      redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
  41. 4
    1
      redhat/main/tdepim/tdepim-14.0.0.spec
  42. 1
    1
      redhat/main/tdesdk/tdesdk-14.0.0.spec
  43. 1
    1
      redhat/main/tdeutils/tdeutils-14.0.0.spec
  44. 3
    1
      redhat/main/tdevelop/tdevelop-14.0.0.spec
  45. 2
    0
      redhat/packages.el5
  46. 2
    0
      redhat/packages.f20
  47. 202
    0
      redhat/packages.f21
  48. 2
    0
      redhat/packages.mga4
  49. 173
    0
      redhat/packages.oss123
  50. 166
    0
      redhat/packages.oss132

+ 1
- 0
redhat/.gitignore View File

@@ -0,0 +1 @@
1
+*/*/patches

+ 1
- 1
redhat/Makefile.r14 View File

@@ -269,7 +269,7 @@ libkexiv2:	tqtinterface
269 269
 libkipi:	tqtinterface
270 270
 	$(call buildpkg,libraries/libkipi)
271 271
 
272
-libksquirrel:	tqtinterface
272
+libksquirrel:	tdelibs
273 273
 	$(call buildpkg,libraries/libksquirrel)
274 274
 
275 275
 libtdeldap:	tqtinterface

+ 1
- 1
redhat/applications/kaffeine/kaffeine-14.0.0.spec View File

@@ -108,7 +108,7 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
108 108
 %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
109 109
 %define with_xine 1
110 110
 %if 0%{?mgaversion} || 0%{?mdkversion}
111
-%if 0%{pclinuxos}
111
+%if 0%{?pclinuxos}
112 112
 BuildRequires: %{_lib}xine-devel
113 113
 %else
114 114
 BuildRequires: %{_lib}xine1.2-devel

+ 6
- 1
redhat/applications/kpilot/kpilot-14.0.0.spec View File

@@ -66,7 +66,7 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
66 66
 and synchronize the built-in applications with their TDE counterparts.
67 67
 
68 68
 
69
-%if 0%{?pclinuxos}
69
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
70 70
 %debug_package
71 71
 %endif
72 72
 
@@ -112,6 +112,11 @@ export PATH="%{tde_bindir}:${PATH}"
112 112
 # Unwanted files
113 113
 %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
114 114
 
115
+# Updates applications categories for openSUSE
116
+%if 0%{?suse_version}
117
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kpilot.desktop          Utility  PDA SyncUtility X-KDE-Utilities-Peripherals
118
+%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop        Utility  PDA X-TDE-Utilities-File
119
+%endif
115 120
 
116 121
 
117 122
 %clean

+ 3
- 1
redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec View File

@@ -111,6 +111,8 @@ export PATH="%{tde_bindir}:${PATH}"
111 111
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
112 112
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
113 113
 
114
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
115
+
114 116
 %clean
115 117
 %__rm -rf %{buildroot}
116 118
 
@@ -134,7 +136,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
134 136
 %{tde_datadir}/applications/tde/audioencoding.desktop
135 137
 %{tde_datadir}/applications/tde/defaultapplication.desktop
136 138
 %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
137
-%{tde_datadir}/applications/tde/laptop.desktop
139
+#%{tde_datadir}/applications/tde/laptop.desktop
138 140
 %{tde_datadir}/applications/tde/medianotifications.desktop
139 141
 %{tde_datadir}/applications/tde/systemsettings.desktop
140 142
 %{tde_datadir}/apps/systemsettings/systemsettingsui.rc

+ 9
- 13
redhat/applications/tdesvn/tdesvn-14.0.0.spec View File

@@ -112,15 +112,14 @@ This package is part of tdesvn-trinity.
112 112
 %prep
113 113
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
114 114
 
115
-# Moves HTML files to the correect location
116
-find . -name "*.cmake" -exec %__sed -i {} \
117
-  -e "s,/doc/HTML,/doc/tde/HTML,g" \
118
-  \;
115
+rm -f src/svnqt/CMakeLists.txt.orig
116
+rm -fr src/svnqt/cache/sqlite3/
117
+
119 118
 
120 119
 
121 120
 %build
122 121
 unset QTDIR QTINC QTLIB
123
-export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
122
+export PATH="%{tde_bindir}:${PATH}"
124 123
 export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
125 124
 
126 125
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -142,7 +141,6 @@ fi
142 141
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
143 142
   -DLIB_INSTALL_DIR=%{tde_libdir} \
144 143
   -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
145
-  -DDATA_INSTALL_DIR=%{tde_datadir} \
146 144
   -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
147 145
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
148 146
   \
@@ -217,11 +215,11 @@ fi
217 215
 %{tde_tdelibdir}/tdesvnpart.la
218 216
 %{tde_tdelibdir}/tdesvnpart.so
219 217
 %{tde_datadir}/applications/tde/tdesvn.desktop
220
-%{tde_datadir}/tdeconf_update/tdesvn-use-external-update.sh
221
-%{tde_datadir}/tdeconf_update/tdesvnpartrc-use-external.upd
222
-%{tde_datadir}/tdesvn/tdesvnui.rc
223
-%{tde_datadir}/tdesvnpart/tdesvn_part.rc
224
-%{tde_datadir}/konqueror/servicemenus/tdesvn_subversion.desktop
218
+%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
219
+%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
220
+%{tde_datadir}/apps/tdesvn/tdesvnui.rc
221
+%{tde_datadir}/apps/tdesvnpart/tdesvn_part.rc
222
+%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
225 223
 %{tde_datadir}/config.kcfg/tdesvn_part.kcfg
226 224
 %{tde_datadir}/icons/hicolor/*/*/*.png
227 225
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
@@ -239,8 +237,6 @@ fi
239 237
 %{tde_libdir}/libtdesvnevents.so
240 238
 %{tde_libdir}/libtdesvnhelpers.la
241 239
 %{tde_libdir}/libtdesvnhelpers.so
242
-#%{tde_datadir}/tdesvn/icons/hicolor/*/apps/tdesvn.png
243
-#%{tde_datadir}/tdesvn/icons/hicolor/scalable/apps/tdesvn.svgz
244 240
 
245 241
 %files -n trinity-libsvnqt
246 242
 %defattr(-,root,root,-)

+ 12
- 2
redhat/build/build_rpm_package.sh View File

@@ -21,9 +21,18 @@ LOGFILE=/tmp/log.${COMP##*/}
21 21
 TEMPDIR="$(mktemp -d)"
22 22
 cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}"
23 23
 
24
-# Check if there are local patches
24
+### Check for patches
25
+
26
+# 1. Check if there is a big, monolithic patch
27
+PATCHDIR="${SPECFILE%/*}/patches"
28
+BIGPATCH="${PATCHDIR}/${PKGNAME}-${TDE_VERSION}.patch"
29
+if [ -r "${BIGPATCH}" ]; then
30
+  cp -f "${BIGPATCH}" "${TEMPDIR}/one.patch"
31
+fi
32
+
33
+# 2. Check if there are small, local patches
25 34
 PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}"
26
-PATCHLIST="${PATCHDIR}/patches"
35
+PATCHLIST="${PATCHDIR}/patches.list"
27 36
 if [ -r "${PATCHLIST}" ]; then
28 37
   while read l; do
29 38
     APPLY=""
@@ -69,6 +78,7 @@ rpmbuild -ba \
69 78
   --define "tde_version ${TDE_VERSION}" \
70 79
   --define "tde_prefix /opt/trinity" \
71 80
   --define "preversion ${PREVERSION:-}" \
81
+  --define "tde_patch 1" \
72 82
   --define "with_akode 1" \
73 83
   --define "with_jack 1" \
74 84
   --define "with_lame 1" \

+ 1
- 1
redhat/build/get_installed_package_version.sh View File

@@ -14,7 +14,7 @@ if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then
14 14
 fi
15 15
 
16 16
 VERSION=${VERSION/-*_/\~}
17
-VERSION=${VERSION%-[0-9]}
17
+#VERSION=${VERSION%-[0-9]}
18 18
 VERSION=${VERSION%.opt}
19 19
 VERSION=${VERSION%.[a-z]*}
20 20
 

+ 31
- 16
redhat/build/get_latest_tarball_filename.sh View File

@@ -6,22 +6,37 @@ TDE_VERSION="${2:-14.0.0}"
6 6
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
7 7
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tde-tarballs/${TDE_VERSION}/
8 8
 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging
9
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat/
9
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/
10
+
11
+EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
12
+
13
+RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
14
+[ -r "${RET}" ] && echo "${RET}" && exit 0
15
+
16
+RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
17
+[ -r "${RET}" ] && echo "${RET}" && exit 0
10 18
 
11 19
 RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1)
12
-if [ -z "${RET}" ]; then
13
-  RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
14
-fi
15
-if [ ! -r "${RET}" ]; then
16
-	# Retry without 'trinity-*', and allow any TAR extension.
17
-	RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
18
-	if [ ! -r "${RET}" ]; then
19
-		# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
20
-		RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
21
-	fi
22
-fi
23
-
24
-[ -z "${RET}" ] && exit 2
25
-
26
-echo "${RET}"
20
+[ -r "${RET}" ] && echo "${RET}" && exit 0
21
+
22
+RET=$(find "${EXTRA_DIR}" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
23
+[ -r "${RET}" ] && echo "${RET}" && exit 0
24
+
25
+# Now look in the 'tde-packaging' directory
26
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
27
+[ -r "${RET}" ] && echo "${RET}" && exit 0
28
+
29
+# Retry without 'trinity-*', and allow any TAR extension.
30
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
31
+[ -r "${RET}" ] && echo "${RET}" && exit 0
32
+
33
+# Retry without 'trinity-*', and allow any TAR extension.
34
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
35
+[ -r "${RET}" ] && echo "${RET}" && exit 0
36
+
37
+# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
38
+RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
39
+[ -r "${RET}" ] && echo "${RET}" && exit 0
40
+
41
+
27 42
 exit 0

+ 34
- 25
redhat/build/get_rpm_package_name.sh View File

@@ -20,7 +20,9 @@ case "${PKGNAME}" in
20 20
   # In case prefix is already there, don't add it again.
21 21
   "trinity-"*) PREFIX="";;
22 22
   # Most TDE dependencies have no prefix
23
-  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
23
+  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
24
+  # Most TDE libraries have no prefix
25
+  #"libkdcraw") PREFIX="";;
24 26
   # 3rd party dependencies
25 27
   "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";;
26 28
   # Extra build stuff
@@ -40,23 +42,27 @@ fi
40 42
 
41 43
 case "${PKGNAME}" in
42 44
   # Some packages have different runtime name than source package.
43
-  "avahi-tqt") PKGRUNTIME="${lib}avahi-tqt1";;
44
-  "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";;
45
-  "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";;
46
-  "esound") PKGRUNTIME="esound-libs";;
47
-  "koffice") PKGRUNTIME="koffice-suite";;
48
-  "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";;
49
-  "libcaldav") PKGRUNTIME="${lib}caldav0";;
50
-  "libcarddav") PKGRUNTIME="${lib}carddav0";;
51
-  "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";;
52
-  "tqca") PKGRUNTIME="${lib}tqca1";;
53
-  "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
54
-  "tqt3") PKGRUNTIME="${lib}tqt3-mt";;
45
+  "avahi-tqt")    PKGRUNTIME="${lib}avahi-tqt1";;
46
+  "dbus-tqt")     PKGRUNTIME="${lib}dbus-tqt-1-0";;
47
+  "dbus-1-tqt")   PKGRUNTIME="${lib}dbus-1-tqt0";;
48
+  "esound")       PKGRUNTIME="esound-libs";;
49
+  "koffice")      PKGRUNTIME="koffice-suite";;
50
+  "libart-lgpl")  PKGRUNTIME="${lib}art_lgpl_2-2";;
51
+  "libcaldav")    PKGRUNTIME="${lib}caldav0";;
52
+  "libcarddav")   PKGRUNTIME="${lib}carddav0";;
53
+  "libkdcraw")    PKGRUNTIME="${lib}kdcraw4";;
54
+  "libkexiv2")    PKGRUNTIME="${lib}kexiv2-5";;
55
+  "libkipi")      PKGRUNTIME="${lib}kipi0";;
56
+  "tqscintilla")  PKGRUNTIME="${lib}tqscintilla7";;
57
+  "tqca")         PKGRUNTIME="${lib}tqca1";;
58
+  "tqca-tls")     PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
59
+  "tqt3")         PKGRUNTIME="${lib}tqt3-mt";;
55 60
   "tqtinterface") PKGRUNTIME="${lib}tqt4";;
56 61
   # Language package: install only French language package
57
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";;
62
+  "k3b-i18n"|"koffice-i18n"|"tde-i18n")
63
+                  PKGRUNTIME="${PKGNAME}-French";;
58 64
   # Default case: runtime package has same name as source package
59
-  *) PKGRUNTIME="${PKGNAME}";;
65
+  *)              PKGRUNTIME="${PKGNAME}";;
60 66
 esac
61 67
 
62 68
 # Finally, display the runtime package name.
@@ -80,19 +86,22 @@ if [ -n "${DEVEL}" ]; then
80 86
 
81 87
   # Some package have specific development package.
82 88
   case "${PKGNAME}" in
83
-    "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";;
84
-    "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";;
85
-    "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
86
-    "esound") PKGDEVEL="esound-devel";;
87
-    "pan") PKGDEVEL="uulib-devel";;
89
+    "avahi-tqt")   PKGDEVEL="libavahi-tqt-devel";;
90
+    "dbus-tqt")    PKGDEVEL="libdbus-tqt-1-devel";;
91
+    "dbus-1-tqt")  PKGDEVEL="libdbus-1-tqt-devel";;
92
+    "esound")      PKGDEVEL="esound-devel";;
93
+    "pan")         PKGDEVEL="uulib-devel";;
88 94
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
89
-    "libcaldav") PKGDEVEL="${lib}caldav-devel";;
90
-    "libcarddav") PKGDEVEL="${lib}carddav-devel";;
91
-    "tqca") PKGDEVEL="${lib}tqca-devel";;
95
+    "libcaldav")   PKGDEVEL="${lib}caldav-devel";;
96
+    "libcarddav")  PKGDEVEL="${lib}carddav-devel";;
97
+    "libkdcraw")   PKGDEVEL="${lib}kdcraw-devel";;
98
+    "libkexiv2")   PKGDEVEL="${lib}kexiv2-devel";;
99
+    "libkipi")     PKGDEVEL="${lib}kipi-devel";;
100
+    "tqca")        PKGDEVEL="${lib}tqca-devel";;
92 101
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
93
-    "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
102
+    "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
94 103
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
95
-    *) PKGDEVEL="${PKGRUNTIME}-devel";;
104
+    *)             PKGDEVEL="${PKGRUNTIME}-devel";;
96 105
   esac
97 106
 
98 107
   # Finally, other packages do have a '-devel'

+ 4
- 1
redhat/build/get_source_files.sh View File

@@ -11,10 +11,13 @@ SPECDIR="${SPECFILE%/*}"
11 11
 
12 12
 while read var val; do
13 13
   case "${var}" in
14
+    Version:*) VERSION="${val}";;
14 15
     Source[0-9]*:|Source:|Patch[0-9]*:)
15
-      FILE=$(rpm -E "${SPECDIR}/${val##*/}")
16
+      FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${PKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}")
16 17
       if [ -r "${FILE}" ]; then
17 18
         echo "${FILE}"
19
+      else
20
+        echo "Warning: cannot find '${FILE}'" >&2
18 21
       fi
19 22
     ;;
20 23
   esac

+ 1
- 1
redhat/build/get_specfile.sh View File

@@ -6,7 +6,7 @@ TDE_VERSION="${2:-14.0.0}"
6 6
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
7 7
 
8 8
 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging
9
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat
9
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat
10 10
 
11 11
 # Special case for QT3
12 12
 if [ "${PKGNAME}" = "qt3" ]; then

+ 17
- 0
redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec View File

@@ -54,9 +54,26 @@ BuildRequires:	gcc-c++
54 54
 BuildRequires:	pkgconfig
55 55
 BuildRequires:	libtool
56 56
 
57
+# GLIB2 support
58
+BuildRequires:	glib2-devel
59
+
57 60
 # GETTEXT support
58 61
 BuildRequires:	gettext-devel
59 62
 
63
+# Xi support
64
+%if 0%{?rhel} == 4
65
+BuildRequires:	xorg-x11-devel
66
+%endif
67
+%if 0%{?mgaversion} || 0%{?mdkversion}
68
+BuildRequires:	%{_lib}xi-devel
69
+%endif
70
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
71
+BuildRequires:	libXi-devel
72
+%endif
73
+%if 0%{?suse_version} == 1140
74
+BuildRequires:	libXi6-devel
75
+%endif
76
+
60 77
 # DBUS support
61 78
 %if 0%{?suse_version}
62 79
 BuildRequires:	dbus-1-devel

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

@@ -1291,6 +1291,7 @@ for d in \
1291 1291
 	%{_includedir}/Xft2/X11/Xft \
1292 1292
 	%{_includedir}/mysql \
1293 1293
 	%{_includedir}/libpng15 \
1294
+	%{_includedir}/libpng16 \
1294 1295
 ; do
1295 1296
 	if [ -d "${d}" ]; then
1296 1297
 		INCDIRS="${INCDIRS} -I${d}"

+ 11
- 1
redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec View File

@@ -69,6 +69,16 @@ BuildRequires:	cmake >= 2.8
69 69
 BuildRequires:	gcc-c++
70 70
 BuildRequires:	pkgconfig
71 71
 
72
+# UUID support
73
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
74
+%define uuid_devel libuuid-devel
75
+%endif
76
+%if 0%{?rhel} == 5
77
+%define uuid_devel e2fsprogs-devel
78
+%endif
79
+%{?uuid_devel:BuildRequires: %{uuid_devel}}
80
+
81
+
72 82
 # PTHREAD support
73 83
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
74 84
 BuildRequires:	pth-devel
@@ -92,7 +102,7 @@ BuildRequires: Mesa-libGLU-devel
92 102
 BuildRequires:	xorg-x11-devel
93 103
 %endif
94 104
 %if 0%{?mgaversion} || 0%{?mdkversion}
95
-BuildRequires:	%{_lib}xi-devel
105
+BuildRequires:	libxi-devel
96 106
 %endif
97 107
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
98 108
 BuildRequires:	libXi-devel

+ 52
- 33
redhat/extras/akode/akode-14.0.0.spec View File

@@ -1,34 +1,56 @@
1
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
2
-%if "%{?tde_prefix}" != "/usr"
3
-%define _variant .opt
4
-%endif
5
-
6
-# TDE 3.5.13 specific building variables
1
+#
2
+# spec file for package akode (version R14.0.0)
3
+#
4
+# Copyright (c) 2014 Trinity Desktop Environment
5
+#
6
+# All modifications and additions to the file contributed by third parties
7
+# remain the property of their copyright owners, unless otherwise agreed
8
+# upon. The license for this file, and modifications and additions to the
9
+# file, is the same license as for the pristine package itself (unless the
10
+# license for the pristine package is not an Open Source License, in which
11
+# case the license is the MIT License). An "Open Source License" is a
12
+# license that conforms to the Open Source Definition (Version 1.9)
13
+# published by the Open Source Initiative.
14
+#
15
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
16
+#
17
+
18
+# BUILD WARNING:
19
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
20
+#  Having KDE libraries may cause FTBFS here !
21
+
22
+# TDE variables
23
+%define tde_epoch 2
24
+%define tde_version 14.0.0
25
+%define tde_prefix /opt/trinity
7 26
 %define tde_bindir %{tde_prefix}/bin
8 27
 %define tde_datadir %{tde_prefix}/share
9 28
 %define tde_docdir %{tde_datadir}/doc
10 29
 %define tde_includedir %{tde_prefix}/include
11 30
 %define tde_libdir %{tde_prefix}/%{_lib}
12 31
 %define tde_mandir %{tde_datadir}/man
13
-
14
-%define tde_tdeappdir %{tde_datadir}/applications/kde
32
+%define tde_tdeappdir %{tde_datadir}/applications/tde
15 33
 %define tde_tdedocdir %{tde_docdir}/tde
16 34
 %define tde_tdeincludedir %{tde_includedir}/tde
17 35
 %define tde_tdelibdir %{tde_libdir}/trinity
18 36
 
19
-%define _docdir %{tde_docdir}
37
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
38
+%if "%{?tde_prefix}" != "/usr"
39
+%define _variant .opt
40
+%endif
20 41
 
21
-Summary: 	Audio-decoding framework 
22 42
 Name:		trinity-akode 
43
+Summary: 	Audio-decoding framework 
44
+Group: 		System Environment/Libraries
45
+Epoch:		%{tde_epoch}
23 46
 Version:	2.0.2
24
-Release:	6%{?dist}%{?_variant}
47
+Release:	1%{?dist}%{?_variant}
48
+URL:		http://www.kde-apps.org/content/show.php?content=30375
25 49
 
26 50
 License:	LGPLv2+
27
-Group: 		System Environment/Libraries
28 51
 #URL:		http://carewolf.com/akode/  
29
-URL:		http://www.kde-apps.org/content/show.php?content=30375
30 52
 
31
-Source0:	akode-14.0.0.tar.gz
53
+Source0:	akode-%{tde_version}.tar.gz
32 54
 
33 55
 Prefix:		%{tde_prefix}
34 56
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,15 +157,15 @@ aKode also has the following audio outputs:
135 157
 %package devel
136 158
 Summary: Headers for developing programs that will use %{name} 
137 159
 Group:   Development/Libraries
138
-Requires: %{name} = %{version}-%{release}
139
-%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}}
140
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}}
141
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}}
142
-%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}}
160
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
161
+%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
162
+%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
163
+%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
164
+%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
143 165
 Requires: pkgconfig
144 166
 
145 167
 %description devel
146
-%{summary}.
168
+This package contains the development files for Akode.
147 169
 
148 170
 %files devel
149 171
 %defattr(-,root,root,-)
@@ -166,10 +188,10 @@ Requires: pkgconfig
166 188
 %package jack 
167 189
 Summary: Jack audio output backend for %{name}
168 190
 Group:   Development/Libraries
169
-Requires: %{name} = %{version}-%{release}
191
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
170 192
 
171 193
 %description jack 
172
-%{summary}.
194
+This package contains the Jack audio output backend for Akode.
173 195
 
174 196
 %files jack 
175 197
 %defattr(-,root,root,-)
@@ -191,10 +213,10 @@ Requires: %{name} = %{version}-%{release}
191 213
 %package pulseaudio
192 214
 Summary: Pulseaudio output backend for %{name}
193 215
 Group:   Development/Libraries
194
-Requires: %{name} = %{version}-%{release}
216
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
195 217
 
196 218
 %description pulseaudio
197
-%{summary}.
219
+This package contains the pulseaudio backend for Akode.
198 220
 Recommended for network transparent audio.
199 221
 
200 222
 %files pulseaudio
@@ -219,10 +241,10 @@ Recommended for network transparent audio.
219 241
 Summary: Resampler based on libsamplerate for %{name}
220 242
 Group:   Development/Libraries
221 243
 License: GPLv2+
222
-Requires: %{name} = %{version}-%{release}
244
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
223 245
 
224 246
 %description libsamplerate 
225
-%{summary}.
247
+This package contains the samplerate decoder for Akode.
226 248
 
227 249
 # License: GPLv2+
228 250
 %files libsamplerate
@@ -245,10 +267,10 @@ Requires: %{name} = %{version}-%{release}
245 267
 %package libmad
246 268
 Summary: Decoder based on libmad for %{name}
247 269
 Group:   Development/Libraries
248
-Requires: %{name} = %{version}-%{release}
270
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
249 271
 
250 272
 %description libmad 
251
-%{summary}.
273
+This package contains the mad decoder for Akode.
252 274
 
253 275
 %files libmad
254 276
 %{tde_libdir}/libakode_mpeg_decoder.la
@@ -264,7 +286,7 @@ Requires: %{name} = %{version}-%{release}
264 286
 
265 287
 ##########
266 288
 
267
-%if 0%{?suse_version} || 0%{?pclinuxos}
289
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
268 290
 %debug_package
269 291
 %endif
270 292
 
@@ -279,9 +301,6 @@ Requires: %{name} = %{version}-%{release}
279 301
 
280 302
 
281 303
 %build
282
-unset QTDIR QTINC QTLIB
283
-export PATH="%{tde_bindir}:${PATH}"
284
-
285 304
 export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
286 305
 
287 306
 %configure \
@@ -331,5 +350,5 @@ done
331 350
 
332 351
 
333 352
 %changelog
334
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
353
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.0.2-1
335 354
 - Initial release for TDE 14.0.0

+ 101
- 0
redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec View File

@@ -0,0 +1,101 @@
1
+# Default version for this component
2
+%define tde_pkg icons-nuvola
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:		Nuvola icons for TDE Desktop
29
+Version:		1.0
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+URL:			http://www.trinitydesktop.org/
38
+
39
+Prefix:			%{_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+Source0:		icons-nuvola-14.0.0.tar.bz2
43
+
44
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
46
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48
+BuildRequires:	desktop-file-utils
49
+
50
+BuildRequires:	gettext
51
+
52
+
53
+%description
54
+Nuvola SVG evolution of SKY icon theme.
55
+ 
56
+ NUVOLA is an SVG based icon theme.
57
+ This mean that all icons where designed with a vector graphics software and 
58
+ then exported to SVG.
59
+ Icons of the TDE version of Nuvola are PNG images (unscalable).
60
+ SVG files are available (not always updated) on my web site in the "svg"
61
+ section.
62
+
63
+
64
+%if 0%{?suse_version} || 0%{?pclinuxos}
65
+%debug_package
66
+%endif
67
+
68
+
69
+%prep
70
+%setup -q -n nuvola
71
+
72
+
73
+%build
74
+
75
+
76
+%install
77
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola
78
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/16x16
79
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/32x32
80
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/48x48
81
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/64x64
82
+install -d -m 755 %{buildroot}%{tde_datadir}/icons/nuvola/128x128
83
+rm -f thanks.to~
84
+cp -fr * %{buildroot}%{tde_datadir}/icons/nuvola/
85
+
86
+
87
+%clean
88
+%__rm -rf %{buildroot}
89
+
90
+
91
+
92
+
93
+%files
94
+%defattr(-,root,root,-)
95
+%doc author license.txt readme.txt 
96
+%{tde_datadir}/icons/nuvola/
97
+
98
+
99
+%changelog
100
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 1.0-1
101
+- Initial release for TDE 14.0.0

+ 138
- 0
redhat/extras/kdevmon/kdevmon-14.0.0.spec View File

@@ -0,0 +1,138 @@
1
+# Default version for this component
2
+%define tde_pkg kdevmon
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:		A utility for monitoring the throughput of one network device
29
+Version:		0.4.6
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+URL:			http://www.trinitydesktop.org/
38
+
39
+Prefix:			%{_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
43
+
44
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
46
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48
+BuildRequires:	desktop-file-utils
49
+
50
+BuildRequires:	gettext
51
+
52
+
53
+%description
54
+Kdevmon is a utility for TDE that monitors the throughput of a network device.
55
+It docks in Kicker (the panel of TDE)  and shows the current network traffic
56
+as a diagram. There also is a resizable main window that provides a larger
57
+traffic diagram and displays the current net speed in bits per second.
58
+Middle-clicking on the dock window or on the main window offers
59
+you an overview of the amount of incoming/outgoing bits and the current and
60
+the maximum bit rate.
61
+
62
+%if 0%{?suse_version} || 0%{?pclinuxos}
63
+%debug_package
64
+%endif
65
+
66
+
67
+%prep
68
+%setup -q -n %{tde_pkg}-%{version}
69
+
70
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
71
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
72
+%__make -f "admin/Makefile.common"
73
+
74
+
75
+%build
76
+unset QTDIR QTINC QTLIB
77
+export PATH="%{tde_bindir}:${PATH}"
78
+
79
+%configure \
80
+  --prefix=%{tde_prefix} \
81
+  --exec-prefix=%{tde_prefix} \
82
+  --bindir=%{tde_bindir} \
83
+  --datadir=%{tde_datadir} \
84
+  --docdir=%{tde_tdedocdir} \
85
+  --includedir=%{tde_tdeincludedir} \
86
+  --libdir=%{tde_libdir} \
87
+  --mandir=%{tde_mandir} \
88
+  \
89
+  --disable-dependency-tracking \
90
+  --disable-debug \
91
+  --enable-new-ldflags \
92
+  --enable-final \
93
+  --enable-closure \
94
+  --enable-rpath \
95
+  --disable-gcc-hidden-visibility
96
+
97
+%__make %{?_smp_mflags} || %__make
98
+
99
+
100
+%install
101
+export PATH="%{tde_bindir}:${PATH}"
102
+%__rm -rf %{buildroot}
103
+%__make install DESTDIR=%{buildroot}
104
+
105
+
106
+%clean
107
+%__rm -rf %{buildroot}
108
+
109
+
110
+%post
111
+for f in locolor ; do
112
+  touch --no-create %{tde_datadir}/icons/${f} || :
113
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
114
+done
115
+/sbin/ldconfig
116
+
117
+
118
+%postun
119
+for f in locolor ; do
120
+  touch --no-create %{tde_datadir}/icons/${f} || :
121
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
122
+done
123
+/sbin/ldconfig
124
+
125
+
126
+%files
127
+%defattr(-,root,root,-)
128
+%doc AUTHORS COPYING
129
+%{tde_bindir}/kdevmon
130
+%{tde_datadir}/applnk/Internet/kdevmon.desktop
131
+%{tde_tdedocdir}/HTML/en/kdevmon/
132
+%{tde_datadir}/icons/locolor/16x16/apps/kdevmon.png
133
+%{tde_datadir}/icons/locolor/32x32/apps/kdevmon.png
134
+
135
+
136
+%changelog
137
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.4.6-1
138
+- Initial release for TDE 14.0.0

+ 175
- 0
redhat/extras/kdissert/kdissert-14.0.0.spec View File

@@ -0,0 +1,175 @@
1
+# Default version for this component
2
+%define tde_pkg kdissert
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:        Mindmapping Tool
29
+Version:		1.0.6c
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+#URL:			http://www.trinitydesktop.org/
38
+URL:            http://freehackers.org/~tnagy/kdissert/
39
+
40
+Prefix:			%{_prefix}
41
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
42
+
43
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
44
+Source1:		TDE.py
45
+
46
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
47
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
48
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
49
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
50
+BuildRequires:	desktop-file-utils
51
+
52
+BuildRequires:	gettext
53
+
54
+
55
+%description
56
+KDissert is a mindmapping tool dedicated to the creation of complex
57
+documents: dissertations, thesis, presentations, and reports. It
58
+features several document generators: latex reports, latex slides
59
+(based on Prosper and Beamer), OpenOffice.org writer and impress, html,
60
+and plain text.
61
+
62
+%if 0%{?suse_version} || 0%{?pclinuxos}
63
+%debug_package
64
+%endif
65
+
66
+
67
+%prep
68
+%setup -q -n %{tde_pkg}-%{version}
69
+
70
+
71
+%build
72
+unset QTDIR QTINC QTLIB
73
+export PATH="%{tde_bindir}:${PATH}"
74
+
75
+%__rm -rf "$HOME/.waf*" 
76
+./waf || :
77
+%__install -D "%{SOURCE1}" "$HOME/.waf-0.9.0/wafadmin/Tools/KDE3.py"
78
+
79
+export CPPFLAGS="${CPPFLAGS} -I%{tde_tdeincludedir} -I%{_includedir}/tqt -I%{_includedir}/tqt3"
80
+
81
+./waf configure --libsuffix=64 \
82
+%ifarch x86_64 ppc64 s390x
83
+	--libsuffix=64 \
84
+%endif
85
+	--prefix=%{tde_prefix} \
86
+	--qtdir=/usr \
87
+	--qtincludes=/usr/include/tqt3 \
88
+	--kdeincludes=%{tde_tdeincludedir}
89
+
90
+./waf
91
+
92
+
93
+%install
94
+export PATH="%{tde_bindir}:${PATH}"
95
+%__rm -rf %{buildroot}
96
+./waf --destdir=%{buildroot} install
97
+
98
+%find_lang %{tde_pkg}
99
+
100
+
101
+%clean
102
+%__rm -rf %{buildroot}
103
+%__rm -rf "$HOME/.waf*" 
104
+
105
+
106
+%post
107
+for f in hicolor ; do
108
+  touch --no-create %{tde_datadir}/icons/${f} || :
109
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
110
+done
111
+/sbin/ldconfig
112
+
113
+
114
+%postun
115
+for f in hicolor ; do
116
+  touch --no-create %{tde_datadir}/icons/${f} || :
117
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
118
+done
119
+/sbin/ldconfig
120
+
121
+
122
+%files -f %{tde_pkg}.lang
123
+%defattr(-,root,root,-)
124
+%{tde_bindir}/kdissert
125
+%{tde_tdelibdir}/libkdissOOOdoc.la
126
+%{tde_tdelibdir}/libkdissOOOdoc.so
127
+%{tde_tdelibdir}/libkdissOOOimpress.la
128
+%{tde_tdelibdir}/libkdissOOOimpress.so
129
+%{tde_tdelibdir}/libkdissapplet.la
130
+%{tde_tdelibdir}/libkdissapplet.so
131
+%{tde_tdelibdir}/libkdissasciidoc.la
132
+%{tde_tdelibdir}/libkdissasciidoc.so
133
+%{tde_tdelibdir}/libkdissbeamerslides.la
134
+%{tde_tdelibdir}/libkdissbeamerslides.so
135
+%{tde_tdelibdir}/libkdissdocbook.la
136
+%{tde_tdelibdir}/libkdissdocbook.so
137
+%{tde_tdelibdir}/libkdisshtmldoc.la
138
+%{tde_tdelibdir}/libkdisshtmldoc.so
139
+%{tde_tdelibdir}/libkdisspdflatexarticle.la
140
+%{tde_tdelibdir}/libkdisspdflatexarticle.so
141
+%{tde_tdelibdir}/libkdisspdflatexbook.la
142
+%{tde_tdelibdir}/libkdisspdflatexbook.so
143
+%{tde_tdelibdir}/libkdissprosperslides.la
144
+%{tde_tdelibdir}/libkdissprosperslides.so
145
+%{tde_tdelibdir}/libkdissstx.la
146
+%{tde_tdelibdir}/libkdissstx.so
147
+%{tde_tdeappdir}/kdissert.desktop
148
+%{tde_datadir}/apps/kdissert/
149
+%{tde_datadir}/apps/kdissertpart/kdissertpart.rc
150
+%{tde_datadir}/config.kcfg/kdissert.kcfg
151
+%{tde_datadir}/doc/tde/HTML/en/kdissert/
152
+%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kdissert/
153
+%{tde_datadir}/icons/hicolor/128x128/actions/kdissert_sort.png
154
+%{tde_datadir}/icons/hicolor/128x128/apps/kdissert.png
155
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_link.png
156
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_point.png
157
+%{tde_datadir}/icons/hicolor/16x16/actions/kdissert_sort.png
158
+%{tde_datadir}/icons/hicolor/16x16/apps/kdissert.png
159
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_link.png
160
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_point.png
161
+%{tde_datadir}/icons/hicolor/22x22/actions/kdissert_sort.png
162
+%{tde_datadir}/icons/hicolor/22x22/apps/kdissert.png
163
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_link.png
164
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_point.png
165
+%{tde_datadir}/icons/hicolor/32x32/actions/kdissert_sort.png
166
+%{tde_datadir}/icons/hicolor/32x32/apps/kdissert.png
167
+%{tde_datadir}/icons/hicolor/64x64/actions/kdissert_sort.png
168
+%{tde_datadir}/icons/hicolor/64x64/apps/kdissert.png
169
+%{tde_datadir}/mimelnk/application/x-kdissert.desktop
170
+%{tde_datadir}/services/kdissertpart.desktop
171
+
172
+
173
+%changelog
174
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 1.0.6c-1
175
+- Initial release for TDE 14.0.0

+ 135
- 0
redhat/extras/kitty/kitty-14.0.0.spec View File

@@ -0,0 +1,135 @@
1
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
2
+%if "%{?tde_prefix}" != "/usr"
3
+%define _variant .opt
4
+%endif
5
+
6
+%define tde_version 14.0.0
7
+
8
+# TDE specific building variables
9
+%define tde_bindir %{tde_prefix}/bin
10
+%define tde_datadir %{tde_prefix}/share
11
+%define tde_docdir %{tde_datadir}/doc
12
+%define tde_includedir %{tde_prefix}/include
13
+%define tde_libdir %{tde_prefix}/%{_lib}
14
+%define tde_mandir %{tde_datadir}/man
15
+
16
+%define tde_tdeappdir %{tde_datadir}/applications/kde
17
+%define tde_tdedocdir %{tde_docdir}/tde
18
+%define tde_tdeincludedir %{tde_includedir}/tde
19
+%define tde_tdelibdir %{tde_libdir}/trinity
20
+
21
+%define _docdir %{tde_docdir}
22
+
23
+Summary: 		a TQt/TDE based RSS podcast and video aggregator
24
+Name:			trinity-kitty 
25
+Version:		0.9.2
26
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
27
+
28
+License:		GPL
29
+Group:			Applications/Network
30
+
31
+Vendor:			Trinity Project
32
+Packager:		Francois Andriot <francois.andriot@free.fr>
33
+URL:			http://www.trinitydesktop.org
34
+
35
+Source:			kitty_0.9.2.orig.tar.gz
36
+Patch1:			kitty_0.9.2-2.1.diff.gz
37
+Patch2:			kitty-14.0.0-ftbfs.patch
38
+
39
+Prefix:			%{tde_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+
43
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
44
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
45
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
46
+BuildRequires:	desktop-file-utils
47
+BuildRequires:	automake
48
+BuildRequires:	libtool
49
+
50
+
51
+%description
52
+Kitty is a simple graphical podcast and video podcast client which allows
53
+you to tune in, watch, download and bookmark podcasts and video podcasts.
54
+
55
+%files
56
+%defattr(-,root,root,-)
57
+%{tde_bindir}/kitty
58
+%{tde_datadir}/applnk/Utilities/kitty.desktop
59
+%{tde_datadir}/apps/kitty/
60
+%{tde_tdedocdir}/HTML/en/kitty/
61
+%{tde_datadir}/icons/hicolor/*/apps/kitty.png
62
+
63
+%post
64
+touch --no-create %{tde_datadir}/icons/hicolor || :
65
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
66
+
67
+%postun 
68
+touch --no-create %{tde_datadir}/icons/hicolor || :
69
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
70
+
71
+##########
72
+
73
+%if 0%{?suse_version} || 0%{?pclinuxos}
74
+%debug_package
75
+%endif
76
+
77
+##########
78
+
79
+%prep
80
+%setup -q -n kitty-0.9.2.orig
81
+%patch1 -p1
82
+patch -p1 < debian/patches/00_am_edit.patch
83
+patch -p1 < debian/patches/01_qsizepolicy.patch
84
+
85
+rm -rf admin
86
+~/tde/tde_r14/experimental/qt3-tqt3/convert_existing_qt3_app_to_tqt3
87
+~/tde/tde_r14/experimental/kde-tde/convert_existing_kde3_app_to_tde
88
+cp -rf ~/tde/tde_r14/main/common/admin/ .
89
+
90
+mv src/khtml_kget_cancel.png src/tdehtml_kget_cancel.png
91
+mv src/khtml_kget.png src/tdehtml_kget.png
92
+
93
+%patch2 -p1
94
+
95
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
96
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
97
+%__make -f admin/Makefile.common
98
+
99
+
100
+%build
101
+unset QTDIR QTINC QTLIB
102
+export PATH="%{tde_bindir}:${PATH}"
103
+
104
+%configure \
105
+  --prefix=%{tde_prefix} \
106
+  --exec-prefix=%{tde_prefix} \
107
+  --bindir=%{tde_bindir} \
108
+  --libdir=%{tde_libdir} \
109
+  --includedir=%{tde_includedir} \
110
+  --datadir=%{tde_datadir} \
111
+  \
112
+  --disable-dependency-tracking \
113
+  --disable-debug \
114
+  --enable-new-ldflags \
115
+  --disable-final \
116
+  --enable-closure \
117
+  --enable-rpath \
118
+  --disable-gcc-hidden-visibility
119
+
120
+%__make %{?_smp_mflags} || %__make
121
+
122
+
123
+%install
124
+%__rm -rf %{buildroot} 
125
+%__make install DESTDIR=%{buildroot}
126
+
127
+
128
+
129
+%clean
130
+%__rm -rf %{buildroot} 
131
+
132
+
133
+%changelog
134
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.2-1
135
+- Initial release for TDE 14.0.0

+ 163
- 0
redhat/extras/klamav/klamav-14.0.0.spec View File

@@ -0,0 +1,163 @@
1
+# Default version for this component
2
+%define tde_pkg klamav
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:        Frontend for clamav
29
+Version:		0.46
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+#URL:			http://www.trinitydesktop.org/
38
+Url:            http://klamav.sourceforge.net/
39
+
40
+Prefix:			%{_prefix}
41
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
42
+
43
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
44
+
45
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
46
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
47
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
48
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
49
+BuildRequires:	desktop-file-utils
50
+
51
+BuildRequires:	gettext
52
+BuildRequires:	curl-devel
53
+BuildRequires:	gmp-devel
54
+BuildRequires:	sqlite-devel
55
+#BuildRequires:	unsermake
56
+BuildRequires:  fdupes
57
+
58
+BuildRequires:  clamav
59
+Requires:		clamav
60
+
61
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
62
+BuildRequires:  clamav-devel
63
+%endif
64
+
65
+
66
+%description
67
+A TDE front-end for the Clam AntiVirus antivirus toolkit.
68
+
69
+%if 0%{?suse_version} || 0%{?pclinuxos}
70
+%debug_package
71
+%endif
72
+
73
+
74
+%prep
75
+%setup -q -n %{tde_pkg}-%{version}
76
+
77
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
78
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
79
+%__make -f "admin/Makefile.common"
80
+
81
+
82
+%build
83
+unset QTDIR QTINC QTLIB
84
+export PATH="%{tde_bindir}:${PATH}"
85
+
86
+# Warning: --enable-final causes FTBFS
87
+%configure \
88
+  --prefix=%{tde_prefix} \
89
+  --exec-prefix=%{tde_prefix} \
90
+  --bindir=%{tde_bindir} \
91
+  --datadir=%{tde_datadir} \
92
+  --docdir=%{tde_tdedocdir} \
93
+  --includedir=%{tde_tdeincludedir} \
94
+  --libdir=%{tde_libdir} \
95
+  --mandir=%{tde_mandir} \
96
+  \
97
+  --disable-dependency-tracking \
98
+  --disable-debug \
99
+  --enable-new-ldflags \
100
+  --enable-final \
101
+  --enable-closure \
102
+  --enable-rpath \
103
+  --disable-gcc-hidden-visibility \
104
+  \
105
+  --without-included-sqlite \
106
+  --with-extra-includes=%{_includedir}/tqt
107
+
108
+find . -name "*.cpp" | while read f; do
109
+  mf="${f%.cpp}.moc"
110
+  if grep -qw "${mf##*/}" "${f}" && [ ! -f "${mf}" ]; then
111
+    tqmoc "${f%.cpp}.h" -o "${mf}"
112
+  fi
113
+done
114
+
115
+%__make %{?_smp_mflags} || %__make
116
+
117
+
118
+%install
119
+export PATH="%{tde_bindir}:${PATH}"
120
+%__rm -rf %{buildroot}
121
+%__make install DESTDIR=%{buildroot}
122
+
123
+%find_lang %{tde_pkg}
124
+
125
+
126
+%clean
127
+%__rm -rf %{buildroot}
128
+	
129
+
130
+%post
131
+for f in hicolor ; do
132
+  touch --no-create %{tde_datadir}/icons/${f} || :
133
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
134
+done
135
+/sbin/ldconfig
136
+
137
+
138
+%postun
139
+for f in hicolor ; do
140
+  touch --no-create %{tde_datadir}/icons/${f} || :
141
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
142
+done
143
+/sbin/ldconfig
144
+
145
+
146
+%files -f %{tde_pkg}.lang
147
+%defattr(-,root,root,-)
148
+%{tde_bindir}/ScanWithKlamAV
149
+%{tde_bindir}/klamarkollon
150
+%{tde_bindir}/klamav
151
+%{tde_bindir}/klammail
152
+%{tde_tdeappdir}/klamav.desktop
153
+%{tde_datadir}/apps/klamav/
154
+%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
155
+%{tde_datadir}/config.kcfg/klamavconfig.kcfg
156
+%{tde_tdedocdir}/HTML/en/klamav02/
157
+%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
158
+%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
159
+
160
+
161
+%changelog
162
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.46-1
163
+- Initial release for TDE 14.0.0

+ 126
- 0
redhat/extras/klibido/klibido-14.0.0.spec View File

@@ -0,0 +1,126 @@
1
+# Default version for this component
2
+%define tde_pkg klibido
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+Name:			trinity-%{tde_pkg}
27
+Summary:		A TDE usenet news grabber for Linux.
28
+Version:		0.2.5
29
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
30
+
31
+License:		GPL
32
+Group:			Applications/Network
33
+
34
+Vendor:			Trinity Project
35
+Packager:		Francois Andriot <francois.andriot@free.fr>
36
+URL:			http://klibido.sourceforge.net/
37
+
38
+Prefix:			%{tde_prefix}
39
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
+
41
+Source0:		%{tde_pkg}-%{version}.tar.gz
42
+
43
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
44
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
45
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
46
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
47
+BuildRequires:	desktop-file-utils
48
+
49
+BuildRequires:	uulib-devel
50
+
51
+
52
+%description
53
+KLibido is a TDE program to download encoded articles from the usenet news
54
+service, using the nntp protocol. It supports multiple servers, multiple
55
+download threads per server, automatic joining and decoding of articles.
56
+
57
+KLibido is not a NewsReader. It doesn't let you easily display the articles -
58
+only their subject, and it discards all non-binary posts. If you want a nice
59
+newsreader for TDE, try KNode.
60
+
61
+%files
62
+%defattr(-,root,root)
63
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README RELEASE TODO
64
+%{tde_bindir}/klibido
65
+%{tde_datadir}/applnk/Utilities/klibido.desktop
66
+%{tde_datadir}/apps/klibido/
67
+%{tde_datadir}/doc/tde/HTML/en/klibido/
68
+%{tde_datadir}/icons/hicolor/*/apps/klibido.png
69
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/klibido.mo
70
+
71
+##########
72
+
73
+%if 0%{?suse_version} || 0%{?pclinuxos}
74
+%debug_package
75
+%endif
76
+
77
+##########
78
+
79
+%prep
80
+%setup -q -n %{tde_pkg}-%{version}
81
+
82
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
83
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
84
+%__make -f "admin/Makefile.common"
85
+
86
+
87
+%build
88
+unset QTDIR QTINC QTLIB
89
+export PATH="%{tde_bindir}:${PATH}"
90
+
91
+if [ -r /usr/include/db53/db_cxx.h ]; then
92
+  EXTRA_INCLUDES="/usr/include/db53"
93
+fi
94
+
95
+%configure \
96
+  --prefix=%{tde_prefix} \
97
+  --exec-prefix=%{tde_prefix} \
98
+  --bindir=%{tde_bindir} \
99
+  --datadir=%{tde_datadir} \
100
+  --includedir=%{tde_tdeincludedir} \
101
+  \
102
+  --disable-dependency-tracking \
103
+  --disable-debug \
104
+  --enable-final \
105
+  --enable-new-ldflags \
106
+  --enable-closure \
107
+  --enable-rpath \
108
+  --disable-gcc-hidden-visibility \
109
+  \
110
+  --with-extra-includes=%{_includedir}/uulib:${EXTRA_INCLUDES}
111
+
112
+%__make %{?_smp_mflags} || %__make
113
+
114
+
115
+%install
116
+%__rm -rf $RPM_BUILD_ROOT
117
+%__make install DESTDIR=$RPM_BUILD_ROOT
118
+
119
+
120
+%clean
121
+rm -rf $RPM_BUILD_ROOT
122
+
123
+
124
+%changelog
125
+* Mon Dec 30 2013 François Andriot <francois.andriot@free.fr> - 0.25-1
126
+- Initial release

+ 139
- 0
redhat/extras/kompose/kompose-14.0.0.spec View File

@@ -0,0 +1,139 @@
1
+# Default version for this component
2
+%define tde_pkg kompose
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:		Full-Screen Task Manager for TDE
29
+Version:		0.5.3
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+URL:			http://www.trinitydesktop.org/
38
+
39
+Prefix:			%{_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
43
+
44
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
46
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48
+BuildRequires:	desktop-file-utils
49
+
50
+BuildRequires:	gettext
51
+BuildRequires:	imlib2-devel
52
+
53
+
54
+%description
55
+Kompose creates a full-screen view in which every window is represented
56
+by a scaled screen shot of it. It appears as a panel applet.
57
+
58
+
59
+%if 0%{?suse_version} || 0%{?pclinuxos}
60
+%debug_package
61
+%endif
62
+
63
+
64
+%prep
65
+%setup -q -n %{tde_pkg}-%{version}
66
+
67
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
68
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
69
+%__make -f "admin/Makefile.common"
70
+
71
+
72
+%build
73
+unset QTDIR QTINC QTLIB
74
+export PATH="%{tde_bindir}:${PATH}"
75
+
76
+# Warning: --enable-final causes FTBFS
77
+%configure \
78
+  --prefix=%{tde_prefix} \
79
+  --exec-prefix=%{tde_prefix} \
80
+  --bindir=%{tde_bindir} \
81
+  --datadir=%{tde_datadir} \
82
+  --docdir=%{tde_tdedocdir} \
83
+  --includedir=%{tde_tdeincludedir} \
84
+  --libdir=%{tde_libdir} \
85
+  --mandir=%{tde_mandir} \
86
+  \
87
+  --disable-dependency-tracking \
88
+  --disable-debug \
89
+  --enable-new-ldflags \
90
+  --disable-final \
91
+  --enable-closure \
92
+  --enable-rpath \
93
+  --disable-gcc-hidden-visibility
94
+
95
+%__make %{?_smp_mflags} || %__make
96
+
97
+
98
+%install
99
+export PATH="%{tde_bindir}:${PATH}"
100
+%__rm -rf %{buildroot}
101
+%__make install DESTDIR=%{buildroot}
102
+
103
+%find_lang %{tde_pkg}
104
+
105
+
106
+%clean
107
+%__rm -rf %{buildroot}
108
+
109
+
110
+%post
111
+for f in hicolor ; do
112
+  touch --no-create %{tde_datadir}/icons/${f} || :
113
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
114
+done
115
+/sbin/ldconfig
116
+
117
+
118
+%postun
119
+for f in hicolor ; do
120
+  touch --no-create %{tde_datadir}/icons/${f} || :
121
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
122
+done
123
+/sbin/ldconfig
124
+
125
+
126
+%files -f %{tde_pkg}.lang
127
+%defattr(-,root,root,-)
128
+%doc TODO README AUTHORS ChangeLog COPYING
129
+%{tde_bindir}/kompose
130
+%{tde_datadir}/applnk/Utilities/kompose.desktop
131
+%{tde_datadir}/apps/kompose/
132
+%{tde_tdedocdir}/HTML/en/kompose/
133
+%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png
134
+%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png
135
+
136
+
137
+%changelog
138
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.5.3-1
139
+- Initial release for TDE 14.0.0

+ 142
- 0
redhat/extras/koverartist/koverartist-14.0.0.spec View File

@@ -0,0 +1,142 @@
1
+# Default version for this component
2
+%define tde_pkg koverartist
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:		Fast Creation of CD/DVD Covers
29
+Version:		0.5
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+URL:			http://www.trinitydesktop.org/
38
+
39
+Prefix:			%{_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+Source0:		%{tde_pkg}-%{tde_version}.tar.gz
43
+
44
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
46
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48
+BuildRequires:	desktop-file-utils
49
+
50
+BuildRequires:	gettext
51
+
52
+
53
+%description
54
+KoverArtist is a program for the fast creation of covers for
55
+cd/dvd cases and boxes. The main idea behind it is to be able
56
+to create decent looking covers with some mouseclicks.
57
+
58
+
59
+%if 0%{?suse_version} || 0%{?pclinuxos}
60
+%debug_package
61
+%endif
62
+
63
+
64
+%prep
65
+%setup -q -n %{tde_pkg}-%{version}
66
+
67
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
68
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
69
+%__make -f "admin/Makefile.common"
70
+
71
+
72
+%build
73
+unset QTDIR QTINC QTLIB
74
+export PATH="%{tde_bindir}:${PATH}"
75
+
76
+%configure \
77
+  --prefix=%{tde_prefix} \
78
+  --exec-prefix=%{tde_prefix} \
79
+  --bindir=%{tde_bindir} \
80
+  --datadir=%{tde_datadir} \
81
+  --docdir=%{tde_tdedocdir} \
82
+  --includedir=%{tde_tdeincludedir} \
83
+  --libdir=%{tde_libdir} \
84
+  --mandir=%{tde_mandir} \
85
+  \
86
+  --disable-dependency-tracking \
87
+  --disable-debug \
88
+  --enable-new-ldflags \
89
+  --enable-final \
90
+  --enable-closure \
91
+  --enable-rpath \
92
+  --disable-gcc-hidden-visibility
93
+
94
+%__make %{?_smp_mflags} || %__make
95
+
96
+
97
+%install
98
+export PATH="%{tde_bindir}:${PATH}"
99
+%__rm -rf %{buildroot}
100
+%__make install DESTDIR=%{buildroot}
101
+
102
+%find_lang %{tde_pkg}
103
+
104
+
105
+%clean
106
+%__rm -rf %{buildroot}
107
+
108
+
109
+%post
110
+for f in hicolor ; do
111
+  touch --no-create %{tde_datadir}/icons/${f} || :
112
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
113
+done
114
+/sbin/ldconfig
115
+
116
+
117
+%postun
118
+for f in hicolor ; do
119
+  touch --no-create %{tde_datadir}/icons/${f} || :
120
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
121
+done
122
+/sbin/ldconfig
123
+
124
+
125
+%files -f %{tde_pkg}.lang
126
+%defattr(-,root,root,-)
127
+%{tde_bindir}/koverartist
128
+%{tde_datadir}/applnk/Multimedia/koverartist.desktop
129
+%{tde_datadir}/apps/koverartist/   
130
+%{tde_tdedocdir}/HTML/en/koverartist/
131
+%{tde_datadir}/icons/hicolor/128x128/apps/koverartist.png
132
+%{tde_datadir}/icons/hicolor/16x16/apps/koverartist.png
133
+%{tde_datadir}/icons/hicolor/22x22/apps/koverartist.png
134
+%{tde_datadir}/icons/hicolor/32x32/apps/koverartist.png
135
+%{tde_datadir}/icons/hicolor/48x48/apps/koverartist.png
136
+%{tde_datadir}/icons/hicolor/64x64/apps/koverartist.png
137
+%{tde_datadir}/mimelnk/application/x-koverartist.desktop
138
+
139
+
140
+%changelog
141
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.5-1
142
+- Initial release for TDE 14.0.0

+ 142
- 0
redhat/extras/kpacman/kpacman-14.0.0.spec View File

@@ -0,0 +1,142 @@
1
+# Default version for this component
2
+%define tde_pkg kpacman
3
+%define tde_version 14.0.0
4
+
5
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
+%if "%{?tde_prefix}" != "/usr"
7
+%define _variant .opt
8
+%endif
9
+
10
+# TDE specific building variables
11
+%define tde_bindir %{tde_prefix}/bin
12
+%define tde_datadir %{tde_prefix}/share
13
+%define tde_docdir %{tde_datadir}/doc
14
+%define tde_includedir %{tde_prefix}/include
15
+%define tde_libdir %{tde_prefix}/%{_lib}
16
+%define tde_mandir %{tde_datadir}/man
17
+%define tde_appdir %{tde_datadir}/applications
18
+
19
+%define tde_tdeappdir %{tde_appdir}/tde
20
+%define tde_tdedocdir %{tde_docdir}/tde
21
+%define tde_tdeincludedir %{tde_includedir}/tde
22
+%define tde_tdelibdir %{tde_libdir}/trinity
23
+
24
+%define _docdir %{tde_docdir}
25
+
26
+
27
+Name:			trinity-%{tde_pkg}
28
+Summary:		A pacman game for the Trinity Desktop.
29
+Version:		0.3.2
30
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
31
+
32
+License:		GPLv2+
33
+Group:			Applications/Utilities
34
+
35
+Vendor:			Trinity Project
36
+Packager:		Francois Andriot <francois.andriot@free.fr>
37
+URL:			http://www.trinitydesktop.org/
38
+
39
+Prefix:			%{_prefix}
40
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+
42
+Source0:		%{tde_pkg}-14.0.0.tar.gz
43
+
44
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
46
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48
+BuildRequires:	desktop-file-utils
49
+
50
+BuildRequires:	gettext
51
+
52
+
53
+%description
54
+Pacman is a legendary game with an enthusiastic following from around 
55
+the world. Since its introduction in 1980, Pacman's image has been 
56
+splashed across magazine covers, television screens, T-shirts, and 
57
+bumper stickers. Created by Japan's Namco, and distributed in the 
58
+United States by Bally, Pacman is an icon of 1980's popular culture
59
+
60
+%if 0%{?suse_version} || 0%{?pclinuxos}
61
+%debug_package
62
+%endif
63
+
64
+
65
+%prep
66
+%setup -q -n %{tde_pkg}-%{version}
67
+
68
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
69
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
70
+%__make -f "admin/Makefile.common"
71
+
72
+
73
+%build
74
+unset QTDIR QTINC QTLIB
75
+export PATH="%{tde_bindir}:${PATH}"
76
+
77
+%configure \
78
+  --prefix=%{tde_prefix} \
79
+  --exec-prefix=%{tde_prefix} \
80
+  --bindir=%{tde_bindir} \
81
+  --datadir=%{tde_datadir} \
82
+  --docdir=%{tde_tdedocdir} \
83
+  --includedir=%{tde_tdeincludedir} \
84
+  --libdir=%{tde_libdir} \
85
+  --mandir=%{tde_mandir} \
86
+  \
87
+  --disable-dependency-tracking \
88
+  --disable-debug \
89
+  --enable-new-ldflags \
90
+  --enable-final \
91
+  --enable-closure \
92
+  --enable-rpath \
93
+  --disable-gcc-hidden-visibility
94
+
95
+%__make %{?_smp_mflags} || %__make
96
+
97
+
98
+%install
99
+export PATH="%{tde_bindir}:${PATH}"
100
+%__rm -rf %{buildroot}
101
+%__make install DESTDIR=%{buildroot}
102
+
103
+%find_lang %{tde_pkg}
104
+
105
+%clean
106
+%__rm -rf %{buildroot}
107
+
108
+
109
+%post
110
+for f in hicolor locolor ; do
111
+  touch --no-create %{tde_datadir}/icons/${f} || :
112
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
113
+done
114
+/sbin/ldconfig
115
+
116
+
117
+%postun
118
+for f in hicolor locolor ; do
119
+  touch --no-create %{tde_datadir}/icons/${f} || :
120
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
121
+done
122
+/sbin/ldconfig
123
+
124
+
125
+%files -f %{tde_pkg}.lang
126
+%defattr(-,root,root,-)
127
+%doc AUTHORS ChangeLog COPYING README TODO
128
+%{tde_bindir}/kpacman
129
+%{tde_datadir}/applnk/Games/kpacman.desktop
130
+%{tde_datadir}/apps/kpacman/   
131
+%{tde_datadir}/config/kpacmanrc
132
+%lang(de) %{tde_tdedocdir}/HTML/de/kpacman/
133
+%{tde_tdedocdir}/HTML/en/kpacman/
134
+%{tde_datadir}/icons/hicolor/16x16/apps/kpacman.png
135
+%{tde_datadir}/icons/hicolor/32x32/apps/kpacman.png
136
+%{tde_datadir}/icons/locolor/16x16/apps/kpacman.png
137
+%{tde_datadir}/icons/locolor/32x32/apps/kpacman.png
138
+
139
+
140
+%changelog
141
+* Sat Sep 20 2014 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
142
+- Initial release for TDE 14.0.0

+ 4
- 4
redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec View File

@@ -541,10 +541,6 @@ export PATH="%{tde_bindir}:${PATH}"
541 541
 %__rm -rf %{buildroot}
542 542
 %__make install DESTDIR=%{buildroot}
543 543
 
544
-# Avoid conflict with tdelibs
545
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
546
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
547
-
548 544
 # Move desktop files to correct XDG location
549 545
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
550 546
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
@@ -558,6 +554,10 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i
558 554
 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
559 555
 popd
560 556
 
557
+# Avoid conflict with tdelibs
558
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
559
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
560
+
561 561
 # Updates applications categories for openSUSE
562 562
 %if 0%{?suse_version}
563 563
 %suse_update_desktop_file -r kmag         Utility Accessibility

+ 1
- 1
redhat/main/tdeaddons/tdeaddons-14.0.0.spec View File

@@ -1,5 +1,5 @@
1 1
 #
2
-# spec file for package tdeaddons
2
+# spec file for package tdeaddons (version R14.0.0)
3 3
 #
4 4
 # Copyright (c) 2014 Trinity Desktop Environment
5 5
 #

+ 1
- 1
redhat/main/tdeadmin/tdeadmin-14.0.0.spec View File

@@ -25,6 +25,7 @@
25 25
 %define tde_pkg tdeadmin
26 26
 %define tde_prefix /opt/trinity
27 27
 %define tde_bindir %{tde_prefix}/bin
28
+%define tde_sbindir %{tde_prefix}/sbin
28 29
 %define tde_datadir %{tde_prefix}/share
29 30
 %define tde_docdir %{tde_datadir}/doc
30 31
 %define tde_includedir %{tde_prefix}/include
@@ -99,7 +100,6 @@ BuildRequires: pam-devel
99 100
 BuildRequires:	lilo
100 101
 %endif
101 102
 
102
-Requires: trinity-tdeadmin = %{version}-%{release}
103 103
 Requires: trinity-kcron = %{version}-%{release}
104 104
 Requires: trinity-kdat = %{version}-%{release}
105 105
 Requires: %{name}-kfile-plugins = %{version}-%{release}

+ 7
- 1
redhat/main/tdeartwork/tdeartwork-14.0.0.spec View File

@@ -106,7 +106,7 @@ BuildRequires:	libXScrnSaver-devel
106 106
 BuildRequires:	xscreensaver
107 107
 BuildRequires:	xscreensaver-base
108 108
 BuildRequires:	xscreensaver-extras
109
-%if 0%{?fedora} || 0%{?rhel} >= 6
109
+%if 0%{?fedora}
110 110
 BuildRequires:	xscreensaver-extras-base
111 111
 %endif
112 112
 BuildRequires:	xscreensaver-gl-base
@@ -716,6 +716,9 @@ This package is part of Trinity, and a component of the TDE artwork module.
716 716
 
717 717
 %if 0%{?fedora} >= 20
718 718
 %{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
719
+%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop
720
+%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop
721
+%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop
719 722
 %endif
720 723
 
721 724
 %endif
@@ -798,6 +801,9 @@ chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
798 801
 
799 802
 # Fix missing screensavers on Fedora 20
800 803
 %if 0%{?with_xscreensaver} &&  0%{?fedora} >= 20
804
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop"
805
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop"
806
+touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop"
801 807
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop"
802 808
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop"
803 809
 touch "%{?buildroot}%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop"

+ 5
- 0
redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 View File

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

+ 16
- 0
redhat/main/tdebase/pamd.kdm-trinity-np.fc21 View File

@@ -0,0 +1,16 @@
1
+ #%PAM-1.0
2
+auth       required    pam_env.so
3
+auth       required    pam_permit.so
4
+auth       include     postlogin
5
+account    required    pam_nologin.so
6
+account    include     system-auth
7
+password   include     system-auth
8
+session    required    pam_selinux.so close
9
+session    required    pam_loginuid.so
10
+session    optional    pam_console.so
11
+-session    optional    pam_ck_connector.so
12
+session    required    pam_selinux.so open
13
+session    optional    pam_keyinit.so force revoke
14
+session    required    pam_namespace.so
15
+session    include     system-auth
16
+session    include     postlogin

+ 19
- 0
redhat/main/tdebase/pamd.kdm-trinity.fc21 View File

@@ -0,0 +1,19 @@
1
+#%PAM-1.0
2
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
3
+auth       required    pam_env.so
4
+auth       substack    system-auth
5
+-auth       optional    pam_gnome_keyring.so
6
+auth       include     postlogin
7
+account    required    pam_nologin.so
8
+account    include     system-auth
9
+password   include     system-auth
10
+session    required    pam_selinux.so close
11
+session    required    pam_loginuid.so
12
+session    optional    pam_console.so
13
+-session    optional    pam_ck_connector.so
14
+session    required    pam_selinux.so open
15
+session    optional    pam_keyinit.so force revoke
16
+session    required    pam_namespace.so
17
+session    include     system-auth
18
+-session    optional    pam_gnome_keyring.so auto_start
19
+session    include     postlogin

+ 5
- 0
redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 View File

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

+ 82
- 40
redhat/main/tdebase/tdebase-14.0.0.spec View File

@@ -170,6 +170,14 @@ Requires:	fedora-logos
170 170
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
171 171
 %endif
172 172
 
173
+# Fedora 21 Theme
174
+%if 0%{?fedora} == 21
175
+Requires:	f21-backgrounds-base
176
+%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png
177
+Requires:	fedora-logos
178
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
179
+%endif
180
+
173 181
 # RHEL 4 Theme
174 182
 %if 0%{?rhel} == 4
175 183
 Requires:	desktop-backgrounds-basic
@@ -235,7 +243,7 @@ Requires:	desktop-common-data
235 243
 
236 244
 # OpenSuse 11.4 Theme
237 245
 %if "%{?suse_version}" == "1140"
238
-Requires:	hicolor-icon-theme-branding = 11.4
246
+Requires:	hicolor-icon-theme-branding
239 247
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
240 248
 %endif
241 249
 
@@ -243,7 +251,7 @@ Requires:	hicolor-icon-theme-branding = 11.4
243 251
 %if "%{?suse_version}" == "1220"
244 252
 Requires:	wallpaper-branding = 12.2
245 253
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
246
-Requires:	hicolor-icon-theme-branding = 12.2
254
+Requires:	hicolor-icon-theme-branding
247 255
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
248 256
 %endif
249 257
 
@@ -251,7 +259,7 @@ Requires:	hicolor-icon-theme-branding = 12.2
251 259
 %if "%{?suse_version}" == "1230"
252 260
 Requires:	wallpaper-branding = 12.3
253 261
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
254
-Requires:	hicolor-icon-theme-branding = 12.3
262
+Requires:	hicolor-icon-theme-branding
255 263
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
256 264
 %endif
257 265
 
@@ -259,7 +267,7 @@ Requires:	hicolor-icon-theme-branding = 12.3
259 267
 %if "%{?suse_version}" == "1310"
260 268
 Requires:	wallpaper-branding = 13.1
261 269
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
262
-Requires:	hicolor-icon-theme-branding = 13.1
270
+Requires:	hicolor-icon-theme-branding
263 271
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
264 272
 %endif
265 273
 
@@ -267,7 +275,7 @@ Requires:	hicolor-icon-theme-branding = 13.1
267 275
 %if "%{?suse_version}" == "1320"
268 276
 Requires:	wallpaper-branding = 13.2
269 277
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
270
-Requires:	hicolor-icon-theme-branding = 13.2
278
+Requires:	hicolor-icon-theme-branding
271 279
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
272 280
 %endif
273 281
 
@@ -533,7 +541,20 @@ BuildRequires:	drakconf
533 541
 
534 542
 # LIBCONFIG support
535 543
 # Needed for "compton" stuff
544
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
545
+%define with_compton 1
536 546
 BuildRequires:	libconfig-devel
547
+%endif
548
+
549
+# KBDLEDSYNC support
550
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
551
+%define with_kbdledsync 1
552
+%endif
553
+
554
+# TDERANDR support
555
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
556
+%define with_tderandrtray 1
557
+%endif
537 558
 
538 559
 # tdebase is a metapackage that installs all sub-packages
539 560
 Requires: %{name}-runtime-data-common = %{version}-%{release}
@@ -758,7 +779,7 @@ Summary:	Common libraries used by kwrite and kate
758 779
 Group:		System/GUI/Other
759 780
 
760 781
 %description -n trinity-libkateinterfaces
761
-%{summary}.
782
+This package contains the kateinterface library.
762 783
 
763 784
 %files -n trinity-libkateinterfaces
764 785
 %defattr(-,root,root,-)
@@ -961,8 +982,10 @@ plugdev group.
961 982
 %{tde_tdelibdir}/kcm_fontinst.so
962 983
 %{tde_tdelibdir}/kcm_fonts.la
963 984
 %{tde_tdelibdir}/kcm_fonts.so
985
+%if 0%{?with_tdehwlib}
964 986
 %{tde_tdelibdir}/kcm_hwmanager.la
965 987
 %{tde_tdelibdir}/kcm_hwmanager.so
988
+%endif
966 989
 %{tde_tdelibdir}/kcm_icons.la
967 990
 %{tde_tdelibdir}/kcm_icons.so
968 991
 %{tde_tdelibdir}/kcm_info.la
@@ -1062,7 +1085,9 @@ plugdev group.
1062 1085
 %{tde_tdeappdir}/filebrowser.desktop
1063 1086
 %{tde_tdeappdir}/filetypes.desktop
1064 1087
 %{tde_tdeappdir}/fonts.desktop
1088
+%if 0%{?with_tdehwlib}
1065 1089
 %{tde_tdeappdir}/hwmanager.desktop
1090
+%endif
1066 1091
 %{tde_tdeappdir}/icons.desktop
1067 1092
 %{tde_tdeappdir}/installktheme.desktop
1068 1093
 %{tde_tdeappdir}/interrupts.desktop
@@ -1169,7 +1194,7 @@ plugdev group.
1169 1194
 %{tde_tdedocdir}/HTML/en/tdefontview/
1170 1195
 
1171 1196
 # The following features are not compiled under RHEL 5 and older
1172
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
1197
+%if 0%{?with_tderandrtray}
1173 1198
 %{tde_bindir}/tderandrtray
1174 1199
 %{tde_tdelibdir}/kcm_displayconfig.la
1175 1200
 %{tde_tdelibdir}/kcm_displayconfig.so
@@ -1221,6 +1246,11 @@ Summary:	Core binaries for the TDE base module
1221 1246
 Group:		System/GUI/Other
1222 1247
 Requires:	%{name}-data = %{version}-%{release}
1223 1248
 Requires:	pam
1249
+%if 0%{?rhel} >= 7
1250
+Requires:	xorg-x11-server-Xorg
1251
+Requires:	xorg-x11-drv-evdev
1252
+Requires:	dejavu-sans-fonts
1253
+%endif
1224 1254
 
1225 1255
 Provides:	tdebase-bin = %{version}-%{release}
1226 1256
 Obsoletes:	tdebase-bin < %{version}-%{release}
@@ -1235,7 +1265,9 @@ TDE applications, particularly those in the TDE base module.
1235 1265
 %if 0%{?with_tsak}
1236 1266
 %{tde_bindir}/tsak
1237 1267
 %endif
1268
+%if 0%{?with_compton}
1238 1269
 %{tde_bindir}/compton-tde
1270
+%endif
1239 1271
 %{tde_bindir}/tdedebugdialog
1240 1272
 %{tde_bindir}/kreadconfig
1241 1273
 %{tde_bindir}/kwriteconfig
@@ -1315,21 +1347,17 @@ TDE applications, particularly those in the TDE base module.
1315 1347
 # SETUID binaries
1316 1348
 # Some setuid binaries need special care
1317 1349
 %if 0%{?suse_version}
1318
-%if 0%{?with_tsak}
1319
-%verify(not mode) %{tde_bindir}/%{tdm}tsak
1320
-%endif
1350
+%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak}
1321 1351
 %verify(not mode) %{tde_bindir}/kcheckpass
1322
-%verify(not mode) %{tde_bindir}/tdekbdledsync
1352
+%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync}
1323 1353
 %else
1324
-%if 0%{?with_tsak}
1325
-%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
1326
-%endif
1354
+%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak}
1327 1355
 %attr(4755,root,root) %{tde_bindir}/kcheckpass
1328
-%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
1356
+%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync}
1329 1357
 %endif
1330 1358
 
1331 1359
 # SUSE's runupdater utility
1332
-%if 0%{?opensuse_bs} == 0 && 0%{?suse_version}
1360
+%if 0
1333 1361
 %{tde_bindir}/runupdater
1334 1362
 %{tde_libdir}/libtdeinit_runupdater.la
1335 1363
 %{tde_libdir}/libtdeinit_runupdater.so
@@ -1343,11 +1371,9 @@ TDE applications, particularly those in the TDE base module.
1343 1371
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
1344 1372
 # Sets permissions on setuid files (openSUSE specific)
1345 1373
 %if 0%{?suse_version}
1346
-%if 0%{?with_tsak}
1347
-%set_permissions %{tde_bindir}/%{tdm}tsak
1348
-%endif
1374
+%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak}
1349 1375
 %set_permissions %{tde_bindir}/kcheckpass
1350
-%set_permissions %{tde_bindir}/tdekbdledsync
1376
+%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync}
1351 1377
 %endif
1352 1378
 
1353 1379
 %postun bin
@@ -1366,7 +1392,8 @@ Obsoletes:	tdebase-bin-devel < %{version}-%{release}
1366 1392
 Provides:	tdebase-bin-devel = %{version}-%{release}
1367 1393
 
1368 1394
 %description bin-devel
1369
-%{summary}.
1395
+This package contains the development files for core binaries for 
1396
+the TDE base module
1370 1397
 
1371 1398
 %files bin-devel
1372 1399
 %defattr(-,root,root,-)
@@ -1651,6 +1678,7 @@ needed for a basic TDE desktop installation.
1651 1678
 %{tde_datadir}/wallpapers/*
1652 1679
 
1653 1680
 # XDG directories information
1681
+%dir %{_sysconfdir}/xdg/menus/applications-merged
1654 1682
 %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
1655 1683
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu
1656 1684
 %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
@@ -2056,7 +2084,7 @@ Group:		Development/Libraries/Other
2056 2084
 Requires:	trinity-kdesktop = %{version}-%{release}
2057 2085
 
2058 2086
 %description -n trinity-kdesktop-devel
2059
-%{summary}.
2087
+This package contains the development files for kdesktop.
2060 2088
 
2061 2089
 %files -n trinity-kdesktop-devel
2062 2090
 %defattr(-,root,root,-)
@@ -2212,6 +2240,14 @@ fi
2212 2240
 /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
2213 2241
 %endif
2214 2242
 
2243
+# SELINUX context for tdm
2244
+%if 0%{?fedora} == 21
2245
+if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
2246
+  echo "%{tde_bindir}/tdm	--	system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
2247
+  restorecon "%{tde_bindir}/tdm"
2248
+fi
2249
+%endif
2250
+
2215 2251
 # Sets default user icon in TDM
2216 2252
 if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
2217 2253
   [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
@@ -2252,7 +2288,7 @@ Requires:	trinity-tdm = %{version}-%{release}
2252 2288
 %{?xtst_devel:Requires: %{xtst_devel}}
2253 2289
 
2254 2290
 %description -n trinity-tdm-devel
2255
-%{summary}.
2291
+This package contains the development files for TDM.
2256 2292
 
2257 2293
 %files -n trinity-tdm-devel
2258 2294
 %defattr(-,root,root,-)
@@ -2486,7 +2522,7 @@ Requires:	trinity-kicker = %{version}-%{release}
2486 2522
 %{?xtst_devel:Requires: %{xtst_devel}}
2487 2523
 
2488 2524
 %description -n trinity-kicker-devel
2489
-%{summary}.
2525
+This package contains the development files for kicker.
2490 2526
 
2491 2527
 %files -n trinity-kicker-devel
2492 2528
 %defattr(-,root,root,-)
@@ -2766,7 +2802,7 @@ Group:		Development/Libraries/Other
2766 2802
 Requires:	trinity-konqueror = %{version}-%{release}
2767 2803
 
2768 2804
 %description -n trinity-konqueror-devel
2769
-%{summary}.
2805
+This package contains the development files for konqueror.
2770 2806
 
2771 2807
 %files -n trinity-konqueror-devel
2772 2808
 %defattr(-,root,root,-)
@@ -3045,7 +3081,7 @@ Group:		Development/Libraries/Other
3045 3081
 Requires:	trinity-ksplash = %{version}-%{release}
3046 3082
 
3047 3083
 %description -n trinity-ksplash-devel
3048
-%{summary}.
3084
+This package contains the development files for ksplash.
3049 3085
 
3050 3086
 %files -n trinity-ksplash-devel
3051 3087
 %defattr(-,root,root,-)
@@ -3109,7 +3145,7 @@ Group:		Development/Libraries/Other
3109 3145
 Requires:	trinity-ksysguard = %{version}-%{release}
3110 3146
 
3111 3147
 %description -n trinity-ksysguard-devel
3112
-%{summary}.
3148
+This package contains the development files for ksysguard.
3113 3149
 
3114 3150
 %files -n trinity-ksysguard-devel
3115 3151
 %defattr(-,root,root,-)
@@ -3185,7 +3221,6 @@ This package contains the default X window manager for TDE.
3185 3221
 
3186 3222
 %files -n trinity-twin
3187 3223
 %defattr(-,root,root,-)
3188
-%{tde_bindir}/kompmgr
3189 3224
 %{tde_bindir}/twin
3190 3225
 %{tde_bindir}/twin_killer_helper
3191 3226
 %{tde_bindir}/twin_resumer_helper
@@ -3251,7 +3286,7 @@ Group:		Development/Libraries/Other
3251 3286
 Requires:	trinity-twin = %{version}-%{release}
3252 3287
 
3253 3288
 %description -n trinity-twin-devel
3254
-%{summary}.
3289
+This package contains the development files for twin.
3255 3290
 
3256 3291
 %files -n trinity-twin-devel
3257 3292
 %defattr(-,root,root,-)
@@ -3401,8 +3436,8 @@ Windows and Samba shares.
3401 3436
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
3402 3437
 	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
3403 3438
 %__sed -i "%{starttde}" \
3404
-	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
3405
-	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
3439
+	-e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \
3440
+	-e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|'
3406 3441
 %endif
3407 3442
 
3408 3443
 # TDE default directory and icon in startup script
@@ -3460,6 +3495,11 @@ fi
3460 3495
 %__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop"                      -e "s|^Icon=.*|Icon=kcmcgi|"
3461 3496
 %__sed -i "tdeioslave/media/tdecmodule/media.desktop"                 -e "s|^Icon=.*|Icon=kcmmedia|" 
3462 3497
 
3498
+# RHEL 5 does not support 'compton'
3499
+%if 0%{?with_compton} == 0
3500
+%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
3501
+%endif
3502
+
3463 3503
 
3464 3504
 %build
3465 3505
 unset QTDIR QTINC QTLIB
@@ -3536,6 +3576,7 @@ fi
3536 3576
   -DTDM_PAM_SERVICE="tdm-trinity" \
3537 3577
   -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
3538 3578
 %endif
3579
+  %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
3539 3580
   %{!?with_tsak:-DBUILD_TSAK=OFF} \
3540 3581
   ..
3541 3582
 
@@ -3727,7 +3768,7 @@ popd
3727 3768
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
3728 3769
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop                PrintingUtility
3729 3770
 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
3730
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop
3771
+%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop}
3731 3772
 %suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
3732 3773
 %endif
3733 3774
 
@@ -3746,16 +3787,19 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do
3746 3787
 done
3747 3788
 
3748 3789
 # Remove setuid bit on some binaries.
3749
-%if 0%{?with_tsak}
3750
-chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
3751
-%endif
3790
+%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"}
3752 3791
 chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
3753
-chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
3792
+%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"}
3754 3793
 
3755 3794
 # Fix permissions on shell scripts
3756 3795
 chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh"
3757 3796
 chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
3758 3797
 
3798
+# Removes tderandrtray documentation, if not built.
3799
+%if 0%{?with_tderandrtray} == 0
3800
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
3801
+%endif
3802
+
3759 3803
 # Links duplicate files
3760 3804
 %fdupes "%{?buildroot}%{tde_datadir}"
3761 3805
 
@@ -3767,11 +3811,9 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref
3767 3811
 %if 0%{?suse_version}
3768 3812
 # Check permissions on setuid files (openSUSE specific)
3769 3813
 %verifyscript
3770
-%if 0%{?with_tsak}
3771
-%verify_permissions -e %{tde_bindir}/%{tdm}tsak
3772
-%endif
3814
+%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak}
3773 3815
 %verify_permissions -e %{tde_bindir}/kcheckpass
3774
-%verify_permissions -e %{tde_bindir}/tdekbdledsync
3816
+%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync}
3775 3817
 %endif
3776 3818
 
3777 3819
 

BIN
redhat/main/tdebase/tdm.fc21.pp View File


+ 12
- 0
redhat/main/tdebase/tdm.service.fc21 View File

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

+ 20
- 9
redhat/main/tdebindings/tdebindings-14.0.0.spec View File

@@ -124,7 +124,7 @@ BuildRequires:	openssl-devel
124 124
 BuildRequires: glib-devel
125 125
 BuildRequires: gtk+-devel
126 126
 %endif
127
-%if 0%{?rhel} == 5
127
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
128 128
 %define with_gtk1 1
129 129
 BuildRequires: glib-devel
130 130
 BuildRequires: gtk+-devel
@@ -207,9 +207,16 @@ BuildRequires:	java-1.6.0-sun-devel
207 207
 # Others use OpenJDK
208 208
 BuildRequires: java-openjdk
209 209
 BuildRequires: java-devel >= 1.4.2
210
-%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7
210
+%if 0%{?suse_version} >= 1320
211
+BuildRequires:	java-1_8_0-openjdk-devel
212
+%endif
213
+%if 0%{?fedora} >= 21
214
+BuildRequires: java-1.8.0-openjdk-devel
215
+%endif
216
+%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%{?rhel} >= 7
211 217
 BuildRequires: java-1.7.0-openjdk-devel
212
-%else
218
+%endif
219
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
213 220
 BuildRequires: java-1.6.0-openjdk-devel
214 221
 %endif
215 222
 
@@ -246,7 +253,7 @@ Requires: trinity-tdebindings-java = %{version}-%{release}
246 253
 Requires: trinity-libsmoketqt = %{version}-%{release}
247 254
 Requires: trinity-libsmoketde = %{version}-%{release}
248 255
 Requires: perl-dcop = %{version}-%{release}
249
-Requires: trinity-python-dcop = %{version}-%{release}
256
+Requires: python-dcop = %{version}-%{release}
250 257
 Requires: trinity-libkjsembed1 = %{version}-%{release}
251 258
 Requires: trinity-kjscmd = %{version}-%{release}
252 259
 Requires: trinity-juic = %{version}-%{release}
@@ -616,12 +623,15 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE
616 623
 
617 624
 ##########
618 625
 
619
-%package -n trinity-python-dcop
626
+%package -n python-dcop
620 627
 Summary:	DCOP bindings for Python
621 628
 Group:		System/Libraries
622 629
 Requires:	python
623 630
 
624
-%description -n trinity-python-dcop
631
+Obsoletes:	trinity-python-dcop < %{version}-%{release}
632
+Provides:	trinity-python-dcop = %{version}-%{release}
633
+
634
+%description -n python-dcop
625 635
 This package contains the shared libraries necessary to run and
626 636
 develop Python programs using the Python DCOP bindings
627 637
 libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
@@ -629,7 +639,7 @@ communicating with running TDE applications.
629 639
 
630 640
 This package is part of the official TDE bindings module.
631 641
 
632
-%files -n trinity-python-dcop
642
+%files -n python-dcop
633 643
 %defattr(-,root,root,-)
634 644
 %{python_sitearch}/pcop.la
635 645
 %{python_sitearch}/pcop.so
@@ -1042,7 +1052,7 @@ Requires:	trinity-libqt3-jni-devel = %{version}-%{release}
1042 1052
 Requires:	trinity-libtrinity-jni-devel = %{version}-%{release}
1043 1053
 
1044 1054
 %description devel
1045
-Development files for the TDE bindings.
1055
+This package contains the development files for the TDE bindings.
1046 1056
 
1047 1057
 %files devel
1048 1058
 %defattr(-,root,root,-)
@@ -1079,6 +1089,7 @@ exit 1
1079 1089
 %build
1080 1090
 unset QTDIR QTINC QTLIB
1081 1091
 export PATH="%{tde_bindir}:${PATH}"
1092
+export TDEDIR=%{tde_prefix}
1082 1093
 
1083 1094
 unset JAVA_HOME ||:
1084 1095
 %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
@@ -1105,7 +1116,7 @@ fi
1105 1116
 EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
1106 1117
 %endif
1107 1118
 
1108
-# Warning: GCC visibility causes FTBFS [Bug #1285]
1119
+# Warning: GCC visibility causes FTBFS [Bug #1285]
1109 1120
 %configure \
1110 1121
   --prefix=%{tde_prefix} \
1111 1122
   --exec-prefix=%{tde_prefix} \

+ 1
- 1
redhat/main/tdegames/tdegames-14.0.0.spec View File

@@ -40,7 +40,7 @@
40 40
 %endif
41 41
 
42 42
 
43
-Name:			trinity-tdegames
43
+Name:			trinity-%{tde_pkg}
44 44
 Summary:		Trinity Desktop Environment - Games
45 45
 Version:		%{tde_version}
46 46
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}

+ 11
- 6
redhat/main/tdelibs/tdelibs-14.0.0.spec View File

@@ -171,13 +171,13 @@ BuildRequires:	utempter-devel
171 171
 %endif
172 172
 
173 173
 # HSPELL support
174
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
174
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
175 175
 %define with_hspell 1
176 176
 BuildRequires:	hspell-devel
177 177
 %endif
178 178
 
179 179
 # JASPER support
180
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
180
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
181 181
 %define with_jasper 1
182 182
 %if 0%{?suse_version}
183 183
 BuildRequires:	libjasper-devel
@@ -205,7 +205,7 @@ Requires:		avahi
205 205
 %endif
206 206
 
207 207
 # OPENEXR support
208
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
208
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
209 209
 %define with_openexr 1
210 210
 BuildRequires:	OpenEXR-devel
211 211
 %endif
@@ -253,12 +253,17 @@ BuildRequires:	xz-devel
253 253
 %endif
254 254
 
255 255
 # Certificates support
256
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
257
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
256
+%if 0%{?fedora}
258 257
 BuildRequires:	ca-certificates
259 258
 Requires:		ca-certificates
259
+%if 0%{?fedora} == 20
260
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
261
+%endif
262
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
263
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
264
+%endif
260 265
 %endif
261
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20
266
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
262 267
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
263 268
 Requires:		openssl
264 269
 %endif

+ 6
- 1
redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec View File