Browse Source

RPM: update packages for PCLinuxOS 2018

François Andriot 7 months ago
parent
commit
8d17db2e09
54 changed files with 185 additions and 94 deletions
  1. 22
    22
      redhat/Makefile.r14
  2. 5
    0
      redhat/applications/bibletime/bibletime-14.0.0.spec
  3. 3
    3
      redhat/applications/digikam/digikam-14.0.0.spec
  4. 6
    0
      redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
  5. 15
    4
      redhat/applications/koffice/koffice-14.0.0.spec
  6. 3
    2
      redhat/applications/kopete-otr/kopete-otr-14.0.0.spec
  7. 0
    8
      redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
  8. 1
    1
      redhat/applications/kvirc/kvirc-14.0.0.spec
  9. 2
    2
      redhat/applications/piklab/piklab-14.0.0.spec
  10. 3
    0
      redhat/applications/qalculate-tde/qalculate-tde.spec
  11. 5
    0
      redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
  12. 2
    0
      redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
  13. 1
    1
      redhat/applications/tderadio/tderadio-14.0.0.spec
  14. 1
    1
      redhat/build/configure_repository.sh
  15. 1
    1
      redhat/build/gather_rpm_sources.sh
  16. 2
    4
      redhat/build/get_rpm_package_name.sh
  17. 1
    1
      redhat/build/get_source_files.sh
  18. 1
    1
      redhat/buildenv.sh
  19. 2
    2
      redhat/docker/build.sh
  20. 10
    7
      redhat/docker/el6/Dockerfile.i686
  21. 10
    7
      redhat/docker/el6/Dockerfile.x86_64
  22. 2
    0
      redhat/docker/el6/packages.trinity
  23. 1
    1
      redhat/docker/el7/Dockerfile.x86_64
  24. 9
    0
      redhat/docker/el7/packages
  25. 3
    3
      redhat/docker/f28/Dockerfile.i686
  26. 2
    1
      redhat/docker/f28/Dockerfile.x86_64
  27. 1
    0
      redhat/docker/f28/packages
  28. 1
    1
      redhat/docker/mga6/Dockerfile.i686
  29. 1
    1
      redhat/docker/mga6/Dockerfile.x86_64
  30. 2
    0
      redhat/docker/mga6/packages.i686
  31. 1
    0
      redhat/docker/mga6/packages.x86_64
  32. 1
    1
      redhat/docker/oss150/Dockerfile.x86_64
  33. 3
    1
      redhat/docker/oss150/packages
  34. 1
    1
      redhat/docker/oss423/Dockerfile.x86_64
  35. 1
    0
      redhat/docker/oss423/packages
  36. 1
    1
      redhat/docker/osstw/Dockerfile.i686
  37. 1
    1
      redhat/docker/osstw/Dockerfile.x86_64
  38. 4
    0
      redhat/docker/osstw/packages
  39. 3
    3
      redhat/docker/pclinuxos/Dockerfile.x86_64
  40. 5
    3
      redhat/docker/pclinuxos/packages.x86_64
  41. 2
    2
      redhat/docker/pclinuxos/rpmmacros
  42. 3
    2
      redhat/docker/run.sh
  43. 1
    1
      redhat/extras/fileshareset/fileshareset.spec
  44. 1
    1
      redhat/libraries/kipi-plugins/kipi-plugins.spec
  45. 1
    1
      redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
  46. 1
    1
      redhat/libraries/libkipi/libkipi-14.0.0.spec
  47. 5
    0
      redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
  48. 7
    0
      redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
  49. 8
    0
      redhat/main/tdebase/pamd.kdm-trinity.pclos2018
  50. 5
    0
      redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
  51. 1
    0
      redhat/main/tdebase/tdebase-14.0.0.spec
  52. 5
    0
      redhat/main/tdebindings/tdebindings-14.0.0.spec
  53. 1
    1
      redhat/main/tdegraphics/tdegraphics-14.0.0.spec
  54. 5
    0
      redhat/notes.txt

+ 22
- 22
redhat/Makefile.r14 View File

@@ -1,7 +1,7 @@
1 1
 SHELL := /bin/bash
2 2
 PACKAGING_DIR := $(shell cd ..; pwd)
3 3
 PATH := $(PATH):$(shell pwd)/build
4
-TDE_VERSION := 14.0.4
4
+TDE_VERSION := 14.0.5
5 5
 DIST := $(shell rpm -E %dist)
6 6
 
7 7
 buildpkg = \
@@ -108,6 +108,7 @@ tdegraphics:	tdebase poppler cmake lcms
108 108
 	$(call buildpkg,main/tdegraphics)
109 109
 
110 110
 tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file
111
+	[ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || :
111 112
 	$(call buildpkg,main/tdelibs)
112 113
 
113 114
 tdemultimedia:	tdebase akode
@@ -166,8 +167,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el7*),)
166 167
 endif
167 168
 
168 169
 esound:
169
-# Build on Mageia and CentOS >= 7, Fedora >= 23, Opensuse >= 15.0
170
-ifneq (,$(filter $(DIST),.mga .el7 .fc2 .oss150 .osstw))
170
+# Build on Mageia, Fedora >= 23, Opensuse >= 15.0
171
+ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw))
171 172
 	$(call buildpkg,3rdparty/esound)
172 173
 endif
173 174
 
@@ -190,8 +191,8 @@ ifneq (,$(filter $(DIST),.el5))
190 191
 endif
191 192
 
192 193
 gnuchess:
193
-# Build on CentOS 5, CentOS 7
194
-ifneq (,$(filter $(DIST),.el5 .el7))
194
+# Build on CentOS 5
195
+ifneq (,$(filter $(DIST),.el5))
195 196
 	$(call buildpkg,3rdparty/gnuchess)
196 197
 endif
197 198
 
@@ -210,8 +211,8 @@ endif
210 211
 endif
211 212
 
212 213
 lcms:
213
-# Build on EL7, OSSTW
214
-ifneq (,$(filter $(DIST),.el7 .osstw))
214
+# Build on EL7, OSS150, OSSTW
215
+ifneq (,$(filter $(DIST),.el7 .oss150 .osstw))
215 216
 	$(call buildpkg,3rdparty/lcms)
216 217
 endif
217 218
 
@@ -252,8 +253,8 @@ ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw)
252 253
 endif
253 254
 
254 255
 pcsc-perl:
255
-# Build on CentOS 
256
-ifneq (,$(filter $(DIST),.el5 .el6 .el7))
256
+# Build on CentOS  5
257
+ifneq (,$(filter $(DIST),.el5))
257 258
 	$(call buildpkg,3rdparty/pcsc-perl)
258 259
 endif
259 260
 
@@ -310,7 +311,7 @@ endif
310 311
 
311 312
 wv2:
312 313
 # Do NOT build on Mageia or openSUSE or PCLINUXOS
313
-ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos))
314
+ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018))
314 315
 	$(call buildpkg,3rdparty/wv2)
315 316
 endif
316 317
 
@@ -337,10 +338,7 @@ libksquirrel:	tdelibs
337 338
 	$(call buildpkg,libraries/libksquirrel)
338 339
 
339 340
 libtdeldap:	tqtinterface
340
-# Do NOT build on PCLOS
341
-ifeq ($(wildcard /etc/pclinuxos-release),)
342 341
 	$(call buildpkg,libraries/libtdeldap)
343
-endif
344 342
 
345 343
 libtqt-perl:	tqtinterface
346 344
 	$(call buildpkg,libraries/libtqt-perl)
@@ -452,20 +450,20 @@ kcmautostart:	tdebase
452 450
 	$(call buildpkg,applications/kcmautostart)
453 451
 
454 452
 kcmldap:	tdebase libtdeldap
455
-# Do NOT build on CentOS 5, PCLinuxOS
456
-ifeq (,$(filter $(DIST),.el5 .pclos))
453
+# Do NOT build on CentOS 5
454
+ifeq (,$(filter $(DIST),.el5))
457 455
 	$(call buildpkg,applications/kcmldap)
458 456
 endif
459 457
 
460 458
 kcmldapcontroller:	tdebase kcmldap
461
-# Do NOT build on CentOS 5, PCLinuxOS
462
-ifeq (,$(filter $(DIST),.el5 .pclos))
459
+# Do NOT build on CentOS 5
460
+ifeq (,$(filter $(DIST),.el5))
463 461
 	$(call buildpkg,applications/kcmldapcontroller)
464 462
 endif
465 463
 
466 464
 kcmldapmanager:	tdebase kcmldap
467
-# Do NOT build on CentOS 5, PCLinuxOS
468
-ifeq (,$(filter $(DIST),.el5 .pclos))
465
+# Do NOT build on CentOS 5
466
+ifeq (,$(filter $(DIST),.el5))
469 467
 	$(call buildpkg,applications/kcmldapmanager)
470 468
 endif
471 469
 
@@ -491,8 +489,8 @@ keep:	tdebase rdiff-backup
491 489
 	$(call buildpkg,applications/keep)
492 490
 
493 491
 kerberostray:	tdebase
494
-# Do NOT build on CentOS 5, PCLinuxOS
495
-ifeq (,$(filter $(DIST),.el5 .pclos))
492
+# Do NOT build on CentOS 5
493
+ifeq (,$(filter $(DIST),.el5))
496 494
 	$(call buildpkg,applications/kerberostray)
497 495
 endif
498 496
 
@@ -578,7 +576,9 @@ kooldock:	tdebase
578 576
 	$(call buildpkg,applications/kooldock)
579 577
 
580 578
 kopete-otr:	tdebase tdenetwork
579
+ifeq (,$(filter $(DIST),.pclos2018))
581 580
 	$(call buildpkg,applications/kopete-otr)
581
+endif
582 582
 
583 583
 kpicosim:	tdebase
584 584
 	$(call buildpkg,applications/kpicosim)
@@ -850,7 +850,7 @@ mathemagics:
850 850
 	$(call buildpkg,extras/mathemagics)
851 851
 
852 852
 pan: gmime intltool
853
-ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)))
853
+ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
854 854
 	$(call buildpkg,3rdparty/pan)
855 855
 endif
856 856
 

+ 5
- 0
redhat/applications/bibletime/bibletime-14.0.0.spec View File

@@ -15,6 +15,11 @@
15 15
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
16 16
 #
17 17
 
18
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
19
+%if 0%{?pclinuxos}
20
+%define _disable_ld_no_undefined 1
21
+%endif
22
+
18 23
 # TDE variables
19 24
 %define tde_epoch 2
20 25
 %if "%{?tde_version}" == ""

+ 3
- 3
redhat/applications/digikam/digikam-14.0.0.spec View File

@@ -84,7 +84,7 @@ BuildRequires:	brp-check-trinity
84 84
 %endif
85 85
 
86 86
 # LCMS support
87
-%if 0%{?suse_version}
87
+%if 0%{?suse_version} || 0%{?rhel} >= 7
88 88
 BuildRequires: liblcms-devel
89 89
 %else
90 90
 BuildRequires: lcms-devel
@@ -308,9 +308,9 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
308 308
 %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
309 309
 %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
310 310
 %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
311
-#%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
311
+#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
312 312
 %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
313
-#%lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
313
+#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
314 314
 %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
315 315
 %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
316 316
 

+ 6
- 0
redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec View File

@@ -134,8 +134,10 @@ This is a TDE control center module to manage users, groups, and machines in Ker
134 134
 %defattr(-,root,root,-)
135 135
 %doc AUTHORS ChangeLog COPYING
136 136
 %{tde_bindir}/primaryrccertupdater
137
+%if 0%{?pclinuxos} == 0
137 138
 %{tde_libdir}/slapi-acl-manager.la
138 139
 %{tde_libdir}/slapi-acl-manager.so
140
+%endif
139 141
 %{tde_tdelibdir}/kcm_ldapcontroller.la
140 142
 %{tde_tdelibdir}/kcm_ldapcontroller.so
141 143
 %{tde_tdeappdir}/ldapcontroller.desktop
@@ -155,6 +157,10 @@ This is a TDE control center module to manage users, groups, and machines in Ker
155 157
 %prep
156 158
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
157 159
 
160
+%if 0%{?pclinuxos}
161
+%__rm -rf acl-updater
162
+%endif
163
+
158 164
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
159 165
 %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
160 166
 %__make -f "admin/Makefile.common"

+ 15
- 4
redhat/applications/koffice/koffice-14.0.0.spec View File

@@ -113,16 +113,27 @@ BuildRequires:	OpenEXR-devel
113 113
 BuildRequires:	libexif-devel
114 114
 BuildRequires:	readline-devel
115 115
 
116
+# LCMS support
117
+%if 0%{?suse_version} || 0%{?rhel} >= 7
118
+BuildRequires: liblcms-devel
119
+%else
120
+BuildRequires: lcms-devel
121
+%endif
122
+
123
+# LCMS2 support
116 124
 %if 0%{?suse_version}
117
-BuildRequires:	libbz2-devel
118
-BuildRequires:	liblcms-devel
119 125
 BuildRequires:	liblcms2-devel
126
+%endif
127
+
128
+# BZIP2 support
129
+%if 0%{?suse_version}
130
+BuildRequires:	libbz2-devel
120 131
 %else
121 132
 BuildRequires:	bzip2-devel
122
-BuildRequires:	lcms-devel
133
+%endif
123 134
 
135
+# PAPER support
124 136
 BuildRequires:	libpaper-devel
125
-%endif
126 137
 
127 138
 # RUBY support
128 139
 %if 0%{?with_ruby}

+ 3
- 2
redhat/applications/kopete-otr/kopete-otr-14.0.0.spec View File

@@ -33,9 +33,10 @@
33 33
 %define tde_tdeincludedir %{tde_includedir}/tde
34 34
 %define tde_tdelibdir %{tde_libdir}/trinity
35 35
 
36
-# Required for Mageia 2: removes the ldflag '--no-undefined'
36
+# Required for Mageia 6: removes the ldflag '--no-undefined'
37
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
37 38
 %define _disable_ld_no_undefined 1
38
-
39
+%endif
39 40
 
40 41
 Name:		trinity-%{tde_pkg}
41 42
 Epoch:		%{tde_epoch}

+ 0
- 8
redhat/applications/kstreamripper/kstreamripper-14.0.0.spec View File

@@ -108,14 +108,6 @@ you with managing/ripping your preferred streams.
108 108
 unset QTDIR QTINC QTLIB
109 109
 export PATH="%{tde_bindir}:${PATH}"
110 110
 
111
-# Force running 'tmoc' on all header files
112
-for h in "src/"*".h"; do
113
-  moc="${h/.h/.moc}"
114
-  tmoc "${h}" -o "${moc}"
115
-  cpp="${h/.h/.cpp}"
116
-  echo "#include \"${moc##*/}\"" >>"${cpp}"
117
-done
118
-
119 111
 export QTDIR=/usr
120 112
 python2 /usr/bin/scons configure prefix="%{_prefix}"
121 113
 python2 /usr/bin/scons %{?_smp_mflags}

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

@@ -181,7 +181,7 @@ export PATH="%{tde_bindir}:${PATH}"
181 181
 %__make symlinks -C src/kvilib/build
182 182
 %__make symlinks -C src/kvirc/build
183 183
 
184
-%if 0%{?mgaversion} >= 6
184
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
185 185
 %__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||"
186 186
 %endif
187 187
 

+ 2
- 2
redhat/applications/piklab/piklab-14.0.0.spec View File

@@ -140,13 +140,13 @@ export PATH="%{tde_bindir}:${PATH}"
140 140
   --disable-libreadline \
141 141
 %endif
142 142
 
143
-%if 0%{?mgaversion} >= 6
143
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
144 144
 touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
145 145
 %endif
146 146
 
147 147
 %__make %{?_smp_mflags}
148 148
 
149
-%if 0%{?mgaversion} >= 6
149
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
150 150
 touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
151 151
 %endif
152 152
 

+ 3
- 0
redhat/applications/qalculate-tde/qalculate-tde.spec View File

@@ -71,6 +71,9 @@ BuildRequires:	libqalculate-devel >= 0.9.6
71 71
 %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
72 72
 BuildRequires:	cln-devel
73 73
 %endif
74
+%if 0%{?pclinuxos} >= 2018
75
+BuildRequires:	libcln-devel
76
+%endif
74 77
 
75 78
 # SUSE desktop files utility
76 79
 %if 0%{?suse_version}

+ 5
- 0
redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec View File

@@ -15,6 +15,11 @@
15 15
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
16 16
 #
17 17
 
18
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
19
+%if 0%{?pclinuxos} >= 2018
20
+%define _disable_ld_no_undefined 1
21
+%endif
22
+
18 23
 # TDE variables
19 24
 %define tde_epoch 2
20 25
 %if "%{?tde_version}" == ""

+ 2
- 0
redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec View File

@@ -93,8 +93,10 @@ Requires:		NetworkManager-gnome
93 93
 Requires:		networkmanager
94 94
 %endif
95 95
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
96
+%if 0%{?pclinuxos} == 0
96 97
 BuildRequires:	NetworkManager-glib-devel
97 98
 %endif
99
+%endif
98 100
 %if 0%{?suse_version}
99 101
 BuildRequires:	NetworkManager-devel
100 102
 Requires:		NetworkManager

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

@@ -182,7 +182,7 @@ export PATH="%{tde_bindir}:${PATH}"
182 182
   --enable-alsa \
183 183
   --enable-oss
184 184
 
185
-%if 0%{?mgaversion} >= 6
185
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
186 186
 %__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
187 187
 %endif
188 188
 

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

@@ -43,5 +43,5 @@ fi
43 43
 if [ -x "/usr/bin/apt-get" ]; then
44 44
   [ ! -L "${RPMDIR}/RPMS.${ARCH}" ] && ln -sf "${ARCH}" "${RPMDIR}/RPMS.${ARCH}"
45 45
   [ ! -L "${RPMDIR}/RPMS.noarch" ] && ln -sf "noarch" "${RPMDIR}/RPMS.noarch"
46
-  echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" >"/etc/apt/sources.list.d/rpmbuild.list"
46
+  echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" | sudo tee "/etc/apt/sources.list.d/rpmbuild.list"
47 47
 fi

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

@@ -6,7 +6,7 @@
6 6
 
7 7
 PKGNAME="${1%/}"
8 8
 PKGNAME="${PKGNAME##*/}"
9
-TDE_VERSION="${2:-14.0.4}"
9
+TDE_VERSION="${2:-14.0.5}"
10 10
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
11 11
 DIST="$4"
12 12
 

+ 2
- 4
redhat/build/get_rpm_package_name.sh View File

@@ -21,8 +21,6 @@ case "${PKGNAME}" in
21 21
   "trinity-"*) PREFIX="";;
22 22
   # Most TDE dependencies have no prefix
23 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="";;
26 24
   # 3rd party dependencies
27 25
   "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
28 26
   # Extra build stuff
@@ -46,7 +44,7 @@ case "${PKGNAME}" in
46 44
   "dbus-tqt")         PKGRUNTIME="${lib}dbus-tqt-1-0";;
47 45
   "dbus-1-tqt")       PKGRUNTIME="${lib}dbus-1-tqt0";;
48 46
   "digikam")          PKGRUNTIME="digikam-i18n";;
49
-  "esound")           PKGRUNTIME="libesd0";;
47
+  "esound")           PKGRUNTIME="${lib}esd0";;
50 48
   "imlib1")           PKGRUNTIME="${lib}Imlib1";;
51 49
   "knetworkmanager8") PKGRUNTIME="knetworkmanager";;
52 50
   "koffice")          PKGRUNTIME="koffice-suite";;
@@ -86,7 +84,7 @@ if [ -n "${DEVEL}" ]; then
86 84
 
87 85
   # Some other packags NOT having development package
88 86
   case "${PKGNAME}" in
89
-    "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
87
+    "autoconf"|"automake"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
90 88
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
91 89
   esac
92 90
 

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

@@ -1,7 +1,7 @@
1 1
 #!/bin/bash
2 2
 
3 3
 PKGNAME="${1##*/}"
4
-TDE_VERSION="${2:-14.0.4}"
4
+TDE_VERSION="${2:-14.0.5}"
5 5
 DIST="$3"
6 6
 
7 7
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

+ 1
- 1
redhat/buildenv.sh View File

@@ -3,7 +3,7 @@
3 3
 # This file can be sourced in your .bashrc
4 4
 
5 5
 TDE_BASEDIR=~/tde
6
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
6
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
7 7
 TDE_GITBASESRC=${TDE_BASEDIR}/tde_master
8 8
 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
9 9
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}

+ 2
- 2
redhat/docker/build.sh View File

@@ -4,10 +4,10 @@ DISTRIB="$1"
4 4
 TDE_VERSION="$2"
5 5
 ARCH="$3"
6 6
 
7
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
7
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
8 8
 [ -z "${ARCH}" ] && ARCH="x86_64"
9 9
 
10 10
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
11 11
 
12
-docker rmi -f "${IMAGE}"
12
+#docker rmi -f "${IMAGE}"
13 13
 docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"

+ 10
- 7
redhat/docker/el6/Dockerfile.i686 View File

@@ -1,22 +1,25 @@
1 1
 FROM centos32:6
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=i686
5 5
 
6
+RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
7
+
6 8
 # Add EPEL repository
7
-RUN yum install -y epel-release
9
+RUN yum -y install epel-release
8 10
 
9 11
 # Add NUX repository
10 12
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
11 13
 
12 14
 # Install Trinity build dependencies
13
-ADD packages.trinity /etc/yum.repos.d/packages
14
-RUN setarch ${ARCH} yum update -y
15
-RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || :
15
+ADD packages.trinity /packages
16
+RUN setarch ${ARCH} yum -y update
17
+RUN setarch ${ARCH} yum -y install $(</packages)
16 18
 
17 19
 # Add YUM repository for locally built packages
18
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
19
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
20
+WORKDIR /etc/yum.repos.d
21
+ADD rpmbuild.repo rpmbuild.repo
22
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
20 23
 
21 24
 # Add non-root user to build packages
22 25
 RUN useradd -m -s /bin/bash -u 1000 trinity

+ 10
- 7
redhat/docker/el6/Dockerfile.x86_64 View File

@@ -1,22 +1,25 @@
1 1
 FROM centos:6
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6
+RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
7
+
6 8
 # Add EPEL repository
7
-RUN yum install -y epel-release
9
+RUN yum -y install epel-release
8 10
 
9 11
 # Add NUX repository
10 12
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
11 13
 
12 14
 # Install Trinity build dependencies
13
-ADD packages.trinity /etc/yum.repos.d/packages
14
-RUN yum update -y
15
-RUN yum install -y $(</etc/yum.repos.d/packages) || :
15
+ADD packages.trinity /packages
16
+RUN yum -y update
17
+RUN yum -y install $(</packages)
16 18
 
17 19
 # Add YUM repository for locally built packages
18
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
19
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
20
+WORKDIR /etc/yum.repos.d
21
+ADD rpmbuild.repo rpmbuild.repo
22
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
20 23
 
21 24
 # Add non-root user to build packages
22 25
 RUN useradd -m -s /bin/bash -u 1000 trinity

+ 2
- 0
redhat/docker/el6/packages.trinity View File

@@ -50,6 +50,7 @@ gcc-gfortran
50 50
 gcc-java
51 51
 gettext-devel
52 52
 glib-devel
53
+gmime-devel
53 54
 gmp-devel
54 55
 gnokii-devel
55 56
 gperf
@@ -190,6 +191,7 @@ taglib-devel
190 191
 tar
191 192
 texinfo
192 193
 texlive-utils
194
+torsocks
193 195
 transfig
194 196
 udisks-devel
195 197
 unixODBC-devel

+ 1
- 1
redhat/docker/el7/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM centos:7
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Add EPEL repository

+ 9
- 0
redhat/docker/el7/packages View File

@@ -14,6 +14,8 @@ cdparanoia
14 14
 cdparanoia-devel
15 15
 chmlib-devel
16 16
 chrpath
17
+clamav
18
+clamav-devel
17 19
 clucene-core-devel
18 20
 cmake
19 21
 cpp
@@ -28,6 +30,7 @@ djvulibre-devel
28 30
 doxygen
29 31
 emacs
30 32
 esound-devel
33
+exempi-devel
31 34
 exiv2-devel
32 35
 fdupes
33 36
 ffmpeg-devel
@@ -43,6 +46,7 @@ gcc-c++
43 46
 gcc-gfortran
44 47
 gettext-devel
45 48
 glib-devel
49
+gmime-devel
46 50
 gmp-devel
47 51
 gperf
48 52
 gpgme-devel
@@ -64,6 +68,8 @@ icu
64 68
 ImageMagick-devel
65 69
 imake
66 70
 imlib-devel
71
+imlib2-devel
72
+intltool
67 73
 jack-audio-connection-kit-devel
68 74
 jasper-devel
69 75
 java-1.7.0-openjdk-devel
@@ -100,6 +106,7 @@ libofx-devel
100 106
 libogg-devel
101 107
 libotr-devel
102 108
 libpaper-devel
109
+libqalculate-devel
103 110
 libraw1394-devel
104 111
 librsvg2-tools
105 112
 libsamplerate-devel
@@ -159,6 +166,7 @@ poppler-devel
159 166
 postgresql-devel
160 167
 pth-devel
161 168
 pulseaudio-libs-devel
169
+qt-devel
162 170
 readline-devel
163 171
 recode
164 172
 redhat-rpm-config
@@ -181,6 +189,7 @@ t1utils
181 189
 taglib-devel
182 190
 tar
183 191
 texinfo
192
+torsocks
184 193
 transfig
185 194
 unixODBC-devel
186 195
 usbutils

+ 3
- 3
redhat/docker/f28/Dockerfile.i686 View File

@@ -1,9 +1,9 @@
1 1
 FROM fedora32:28
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=i686
5 5
 
6
-RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
6
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
7 7
 
8 8
 # Add RPMFUSION repository
9 9
 RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
@@ -11,7 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-
11 11
 # Install Trinity build dependencies
12 12
 RUN setarch i686 dnf update -y
13 13
 ADD packages /packages
14
-#RUN setarch i686 dnf install -y texlive-base
14
+RUN touch /var/lib/rpm/*
15 15
 RUN setarch i686 dnf install -y $(</packages)
16 16
 
17 17
 # Add YUM repository for locally built packages

+ 2
- 1
redhat/docker/f28/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM fedora:28
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
@@ -11,6 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-
11 11
 # Install Trinity build dependencies
12 12
 RUN dnf update -y
13 13
 ADD packages /packages
14
+RUN touch /var/lib/rpm/*
14 15
 RUN dnf install -y $(</packages)
15 16
 
16 17
 # Add YUM repository for locally built packages

+ 1
- 0
redhat/docker/f28/packages View File

@@ -35,6 +35,7 @@ esound-devel
35 35
 exempi-devel
36 36
 exiv2-devel
37 37
 fdupes
38
+fedora-rpm-macros
38 39
 ffmpeg-devel
39 40
 fftw-devel
40 41
 file-devel

+ 1
- 1
redhat/docker/mga6/Dockerfile.i686 View File

@@ -1,6 +1,6 @@
1 1
 FROM mageia32:6
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=i686
5 5
 
6 6
 # Reset URPMI repositories to default

+ 1
- 1
redhat/docker/mga6/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM mageia:6
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Reset URPMI repositories to default

+ 2
- 0
redhat/docker/mga6/packages.i686 View File

@@ -95,6 +95,7 @@ libsane1-devel
95 95
 libt1lib-devel
96 96
 libtiff-devel
97 97
 libtwolame-devel
98
+libutempter
98 99
 libudev-devel
99 100
 libusb1.0-devel
100 101
 libutempter-devel
@@ -186,6 +187,7 @@ notification-daemon
186 187
 ocaml
187 188
 OpenEXR-devel
188 189
 openldap-devel
190
+openldap-servers-devel
189 191
 opensc
190 192
 openslp-devel
191 193
 opensp-devel

+ 1
- 0
redhat/docker/mga6/packages.x86_64 View File

@@ -186,6 +186,7 @@ notification-daemon
186 186
 ocaml
187 187
 OpenEXR-devel
188 188
 openldap-devel
189
+openldap-servers-devel
189 190
 opensc
190 191
 openslp-devel
191 192
 opensp-devel

+ 1
- 1
redhat/docker/oss150/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM opensuse:15.0
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Add PACKMAN repository

+ 3
- 1
redhat/docker/oss150/packages View File

@@ -60,6 +60,7 @@ intltool
60 60
 java-1_8_0-openjdk-devel
61 61
 less
62 62
 libacl-devel
63
+libao-devel
63 64
 libart_lgpl-devel
64 65
 libavahi-devel
65 66
 libavcodec-devel
@@ -85,6 +86,7 @@ libidn-devel
85 86
 libiw-devel
86 87
 libjack-devel
87 88
 libjasper-devel
89
+liblcms-devel
88 90
 liblo-devel
89 91
 liblrdf-devel
90 92
 libmad-devel
@@ -99,6 +101,7 @@ libnjb-devel
99 101
 libnsl-devel
100 102
 libofx-devel
101 103
 libotr-devel
104
+libpaper-devel
102 105
 libpisock-devel
103 106
 libpng16-devel
104 107
 libpoppler-devel
@@ -148,7 +151,6 @@ pciutils-devel
148 151
 pcre-devel
149 152
 pcsc-lite-devel
150 153
 pkcs11-helper-devel
151
-pkgconfig(ao)
152 154
 postgresql
153 155
 postgresql-devel
154 156
 python-devel

+ 1
- 1
redhat/docker/oss423/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM opensuse:42.3
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Add PACKMAN repository

+ 1
- 0
redhat/docker/oss423/packages View File

@@ -87,6 +87,7 @@ libiw-devel
87 87
 libjack-devel
88 88
 libjasper-devel
89 89
 liblcms-devel
90
+liblcms2-devel
90 91
 liblo-devel
91 92
 liblrdf-devel
92 93
 libmad-devel

+ 1
- 1
redhat/docker/osstw/Dockerfile.i686 View File

@@ -1,6 +1,6 @@
1 1
 FROM opensuse32:tumbleweed
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=i686
5 5
 
6 6
 # Add PACKMAN repository

+ 1
- 1
redhat/docker/osstw/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM opensuse:tumbleweed
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Add PACKMAN repository

+ 4
- 0
redhat/docker/osstw/packages View File

@@ -102,6 +102,7 @@ libnsl-devel
102 102
 libofx-devel
103 103
 libopenssl-devel
104 104
 libotr-devel
105
+libpaper-devel
105 106
 libpisock-devel
106 107
 libpng16-devel
107 108
 libpoppler-devel
@@ -127,6 +128,7 @@ libvisual-devel
127 128
 libvorbis-devel
128 129
 libwmf-devel
129 130
 libwpd-devel
131
+libXaw-devel
130 132
 libXdmcp-devel
131 133
 libxine-devel
132 134
 libxkbfile-devel
@@ -135,6 +137,7 @@ libxslt-devel
135 137
 libXss-devel
136 138
 libXt-devel
137 139
 libXtst-devel
140
+libXv-devel
138 141
 libXxf86dga-devel
139 142
 lilo
140 143
 lirc-devel
@@ -144,6 +147,7 @@ meanwhile-devel
144 147
 Mesa-devel
145 148
 Mesa-libGL-devel
146 149
 mozilla-nspr-devel
150
+net-tools
147 151
 net-tools-deprecated
148 152
 NetworkManager-devel
149 153
 ocaml

+ 3
- 3
redhat/docker/pclinuxos/Dockerfile.x86_64 View File

@@ -1,6 +1,6 @@
1 1
 FROM pclinuxos:2017
2 2
 
3
-ARG TDE_VERSION=14.0.4
3
+ARG TDE_VERSION=14.0.5
4 4
 ARG ARCH=x86_64
5 5
 
6 6
 # Update distribution
@@ -8,8 +8,8 @@ RUN apt-get -y update
8 8
 RUN apt-get -y dist-upgrade
9 9
 
10 10
 # Install Trinity build dependencies
11
-ADD packages.${ARCH} /etc/apt/packages
12
-RUN apt-get -y install $(</etc/apt/packages)
11
+ADD packages.${ARCH} /packages
12
+RUN apt-get -y install $(</packages)
13 13
 
14 14
 # Add rpmbuild repositories
15 15
 ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list

+ 5
- 3
redhat/docker/pclinuxos/packages.x86_64 View File

@@ -43,12 +43,15 @@ htdig
43 43
 ImageMagick-devel
44 44
 imake
45 45
 java-devel
46
+lcms-devel
46 47
 lib64cryptsetup-devel
47 48
 lib64dvdread-devel
48 49
 lib64exiv2-devel
49 50
 lib64gif-devel
51
+lib64idn-devel
50 52
 lib64inotifytools-devel
51 53
 lib64iw29-devel
54
+lib64nm-devel
52 55
 lib64mpcdec-devel
53 56
 lib64OpenSP5-devel
54 57
 lib64pkcs11-helper-devel
@@ -86,12 +89,11 @@ libmp4v2-devel
86 89
 libmtp-devel
87 90
 libmusicbrainz-devel
88 91
 libnjb-devel
89
-libnm-util-devel
90 92
 libofa-devel
91 93
 libofx-devel
92 94
 libotr-devel
93 95
 libpaper-devel
94
-libpng-devel
96
+lib64png1.6-devel
95 97
 libpqxx-devel
96 98
 libpthread-stubs
97 99
 libpulseaudio-devel
@@ -104,6 +106,7 @@ libsm-devel
104 106
 libt1lib-devel
105 107
 libtheora-devel
106 108
 libudev-devel
109
+libuuid-devel
107 110
 libv4l-devel
108 111
 libvisual-devel
109 112
 libvorbis-devel
@@ -131,7 +134,6 @@ mysql-devel
131 134
 nas-devel
132 135
 neon-devel
133 136
 net-snmp-devel
134
-NetworkManager-glib-devel
135 137
 ocaml
136 138
 OpenEXR-devel
137 139
 openldap-devel

+ 2
- 2
redhat/docker/pclinuxos/rpmmacros View File

@@ -1,4 +1,4 @@
1
-%dist .pclos2017
1
+%dist .pclos2018
2 2
 %_smp_mflags -j8
3 3
 %jobs 8
4
-%pclinuxos 2017
4
+%pclinuxos 2018

+ 3
- 2
redhat/docker/run.sh View File

@@ -4,7 +4,7 @@ DISTRIB="$1"
4 4
 TDE_VERSION="$2"
5 5
 ARCH="$3"
6 6
 
7
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
7
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
8 8
 [ -z "${ARCH}" ] && ARCH="x86_64"
9 9
 
10 10
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
@@ -14,8 +14,9 @@ mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
14 14
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
15 15
 mkdir -p "/dev/shm/docker"
16 16
 
17
-docker run -t -i --rm \
17
+docker run -t -i --rm --privileged \
18 18
   -h "${IMAGE}" \
19
+  --name "${IMAGE//:/-}" \
19 20
   -v /dev/shm/docker:/tmp:z \
20 21
   -u trinity \
21 22
   -e TMPPATH=/tmp \

+ 1
- 1
redhat/extras/fileshareset/fileshareset.spec View File

@@ -20,7 +20,7 @@
20 20
 #email                : Uwe.Gansert@suse.de
21 21
 
22 22
 %if 0%{?fedora} >= 27
23
-%define debug_package %{nil}
23
+%global debug_package %{nil}
24 24
 %endif
25 25
 
26 26
 Name:		fileshareset

+ 1
- 1
redhat/libraries/kipi-plugins/kipi-plugins.spec View File

@@ -99,7 +99,7 @@ BuildRequires:	libgpod-devel >= 0.4.2
99 99
 %endif
100 100
 
101 101
 # LCMS support
102
-%if 0%{?suse_version}
102
+%if 0%{?suse_version} || 0%{?rhel} >= 7
103 103
 BuildRequires: liblcms-devel
104 104
 %else
105 105
 BuildRequires: lcms-devel

+ 1
- 1
redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec View File

@@ -66,7 +66,7 @@ BuildRequires: pkgconfig
66 66
 BuildRequires: gettext
67 67
 
68 68
 # LCMS support
69
-%if 0%{?suse_version}
69
+%if 0%{?suse_version} || 0%{?rhel} >= 7
70 70
 BuildRequires: liblcms-devel
71 71
 %else
72 72
 BuildRequires: lcms-devel

+ 1
- 1
redhat/libraries/libkipi/libkipi-14.0.0.spec View File

@@ -73,7 +73,7 @@ BuildRequires: gettext
73 73
 BuildRequires: gcc-c++
74 74
 
75 75
 # LCMS support
76
-%if 0%{?suse_version}
76
+%if 0%{?suse_version} || 0%{?rhel} >= 7
77 77
 BuildRequires: liblcms-devel
78 78
 %else
79 79
 BuildRequires: lcms-devel

+ 5
- 0
redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 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

+ 7
- 0
redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 View File

@@ -0,0 +1,7 @@
1
+#%PAM-1.0
2
+auth       required pam_env.so
3
+auth       required pam_permit.so
4
+account    include system-auth
5
+password   include system-auth
6
+session    include system-auth
7
+session    optional  pam_console.so

+ 8
- 0
redhat/main/tdebase/pamd.kdm-trinity.pclos2018 View File

@@ -0,0 +1,8 @@
1
+#%PAM-1.0
2
+auth       include system-auth
3
+auth       required	pam_nologin.so
4
+account    include system-auth
5
+password   include system-auth
6
+session    include system-auth
7
+session    optional  pam_console.so
8
+session    required  pam_namespace.so

+ 5
- 0
redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 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

+ 1
- 0
redhat/main/tdebase/tdebase-14.0.0.spec View File

@@ -1885,6 +1885,7 @@ group.
1885 1885
 %{tde_datadir}/apps/tdeio_info/
1886 1886
 %{tde_datadir}/apps/tdeio_man/
1887 1887
 %{tde_datadir}/apps/systemview/
1888
+%{tde_datadir}/autostart/mediabackend.desktop
1888 1889
 %{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
1889 1890
 %{tde_datadir}/mimelnk/application/x-smb-server.desktop
1890 1891
 %{tde_datadir}/mimelnk/inode/system_directory.desktop

+ 5
- 0
redhat/main/tdebindings/tdebindings-14.0.0.spec View File

@@ -15,6 +15,11 @@
15 15
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
16 16
 #
17 17
 
18
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
19
+%if 0%{?pclinuxos}
20
+%define _disable_ld_no_undefined 1
21
+%endif
22
+
18 23
 # BUILD WARNING:
19 24
 #  Remove qt-devel and qt3-devel and any kde*-devel on your system !
20 25
 #  Having KDE libraries may cause FTBFS here !

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

@@ -215,7 +215,7 @@ BuildRequires:	trinity-poppler-devel >= 0.12
215 215
 %endif
216 216
 
217 217
 # LCMS support
218
-%if 0%{?suse_version}
218
+%if 0%{?suse_version} || 0%{?rhel} >= 7
219 219
 BuildRequires: liblcms-devel
220 220
 %else
221 221
 BuildRequires: lcms-devel

+ 5
- 0
redhat/notes.txt View File

@@ -28,6 +28,11 @@ Bug in /usr/lib[64]/pkgconfig/ruby.pc : missing "ruby_version:" value
28 28
 Should be: ruby_version=2.0.0
29 29
 
30 30
 
31
+MAGEIA 6:
32
+if tdegraphics fails because of 'nullptr' undefined:
33
+vi /usr/include/poppler/PDFDoc.h
34
+add '#define nullptr NULL'
35
+
31 36
 
32 37
 CENTOS 4 / CENTOS 5
33 38
 Some mandatory packages are missing or too old.

Loading…
Cancel
Save