Browse Source

Updates for TDE 3.5.12 for RHEL5

Signed-off-by: albator <albator@arcadia.vtf>
tags/v3.5.13
albator 7 years ago
parent
commit
7097fba691

+ 2
- 0
fedora/README.txt View File

@@ -0,0 +1,2 @@
1
+The Fedora packages are the same as the RedHat packages.
2
+See directory 'redhat' to get the SPECS files.

+ 17
- 7
redhat/applications/k3b/trinity-k3b-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 6
5
+%define release 7
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -32,6 +32,11 @@ Obsoletes: k3b
32 32
 
33 33
 Group:   Applications/Archiving
34 34
 License: GPLv2+
35
+
36
+Prefix:		%{_prefix}
37
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
38
+
39
+
35 40
 Source0: k3b-%{version}.tar.gz
36 41
 Source1: k3b-i18n-1.0.5.tar.bz2
37 42
 Source2: k3brc
@@ -57,7 +62,7 @@ BuildRequires: dbus-qt-devel hal-devel
57 62
 BuildRequires: flac-devel
58 63
 BuildRequires: gettext
59 64
 BuildRequires: libdvdread-devel
60
-%if 0%{?fedora} >= 15
65
+%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
61 66
 BuildRequires: libmpcdec-devel
62 67
 %else
63 68
 BuildRequires: musepack-tools-devel
@@ -96,7 +101,9 @@ start.
96 101
 Summary:  Common files of %{name}
97 102
 Group:    Applications/Archiving
98 103
 Requires: %{name} = %{version}-%{release}
104
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
99 105
 BuildArch: noarch
106
+%endif
100 107
 %description common
101 108
 %{summary}.
102 109
 
@@ -165,15 +172,15 @@ popd
165 172
 
166 173
 %install
167 174
 %__rm -rf %{buildroot}
168
-%make_install
169
-%make_install -C k3b-i18n-1.0.5
170
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
175
+%__make install DESTDIR=%{buildroot}
176
+%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
177
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
171 178
 
172 179
 # remove the .la files
173
-%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la 
180
+%__rm -f %{buildroot}%{_libdir}/libk3b*.la 
174 181
 
175 182
 # remove i18n for Plattdeutsch (Low Saxon)
176
-%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
183
+%__rm -fr %{buildroot}%{_datadir}/locale/nds
177 184
 
178 185
 %find_lang k3b --with-kde
179 186
 %find_lang k3bsetup 
@@ -244,6 +251,9 @@ update-desktop-database -q &> /dev/null
244 251
 
245 252
 
246 253
 %changelog
254
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
255
+- Add support for RHEL5
256
+
247 257
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
248 258
 - Import to GIT
249 259
 

+ 1
- 0
redhat/components.txt View File

@@ -19,5 +19,6 @@ kdeadmin
19 19
 kdegames
20 20
 kdeedu
21 21
 kdeaddons
22
+kdewebdev
22 23
 kde-i18n
23 24
 applications/k3b

+ 8
- 2
redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 6
5
+%define release 7
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -31,6 +31,9 @@ Vendor:		Trinity Project
31 31
 Packager:	Francois Andriot <francois.andriot@free.fr>
32 32
 URL:		http://www.trinitydesktop.org/
33 33
 
34
+Prefix:    %{_prefix}
35
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
36
+
34 37
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
35 38
 License:	GFDL
36 39
 Group:		User Interface/Desktops
@@ -653,7 +656,7 @@ for l in %{KDE_LANGS}; do
653 656
         sed -i docs/Makefile -e "s,^\(SUBDIRS =.*\)common\(.*\)$,\1 \2,"
654 657
       fi
655 658
 
656
-      %{__make} install DESTDIR=%{?buildroot}
659
+      %__make install DESTDIR=%{?buildroot}
657 660
       popd
658 661
     fi
659 662
   done
@@ -1221,6 +1224,9 @@ rm -rf %{buildroot}
1221 1224
 %endif
1222 1225
 
1223 1226
 %changelog
1227
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
1228
+- Add support for RHEL5
1229
+
1224 1230
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
1225 1231
 - Re-introduce all languages
1226 1232
 

+ 8
- 4
redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -29,9 +29,10 @@ Vendor:		Trinity Project
29 29
 Packager:	Francois Andriot <francois.andriot@free.fr>
30 30
 URL:		http://www.trinitydesktop.org/
31 31
 
32
-Source0: kdeaccessibility-%{version}.tar.gz
32
+Prefix:		%{_prefix}
33
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
33 34
 
34
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
35
+Source0: kdeaccessibility-%{version}.tar.gz
35 36
 
36 37
 
37 38
 Provides: kdeaccessibility3 = %{version}-%{release}
@@ -91,7 +92,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
91 92
 %install
92 93
 export PATH="%{_bindir}:${PATH}"
93 94
 %__rm -rf %{buildroot}
94
-%make_install
95
+%__make install DESTDIR=%{buildroot}
95 96
 
96 97
 desktop-file-install \
97 98
   --vendor="" \
@@ -170,6 +171,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
170 171
 
171 172
 
172 173
 %changelog
174
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
175
+- Add support for RHEL5
176
+
173 177
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
174 178
 - Initial build for RHEL 6
175 179
 - Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"

+ 8
- 3
redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -29,10 +29,12 @@ Vendor:		Trinity Project
29 29
 Packager:	Francois Andriot <francois.andriot@free.fr>
30 30
 URL:		http://www.trinitydesktop.org/
31 31
 
32
+Prefix:    %{_prefix}
33
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
34
+
32 35
 Source0: kdeaddons-%{version}.tar.gz
33 36
 Source1: metabar-fedora.tar.bz2
34 37
 Source2: metabarrc
35
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
36 38
 
37 39
 Patch3: kdeaddons-3.5.3-sdl.patch
38 40
 
@@ -111,7 +113,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
111 113
 %install
112 114
 export PATH="%{_bindir}:${PATH}"
113 115
 %__rm -rf %{buildroot}
114
-%make_install
116
+%__make install DESTDIR=%{buildroot}
115 117
 
116 118
 # File lists for locale
117 119
 HTML_DIR=$(kde-config --expandvars --install html)
@@ -238,6 +240,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
238 240
 
239 241
 
240 242
 %changelog
243
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
244
+- Add support for RHEL5
245
+
241 246
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
242 247
 - Initial build for RHEL 6
243 248
 - Spec file based on Fedora 8 "kdeaddons-3.5.10-1"

+ 11
- 5
redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -33,6 +33,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
33 33
 URL:		http://www.trinitydesktop.org/
34 34
 
35 35
 Prefix:		%{_prefix}
36
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
36 37
 
37 38
 Source0: kdeadmin-%{version}.tar.gz
38 39
 Source1: kuser.pam
@@ -94,7 +95,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
94 95
 %install
95 96
 export PATH="%{_bindir}:${PATH}"
96 97
 %__rm -rf %{buildroot}
97
-%make_install
98
+%__make install DESTDIR=%{buildroot}
98 99
 
99 100
 %if 0%{?rhel} > 1
100 101
 comps="kcron kdat knetworkconf"
@@ -171,20 +172,25 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
171 172
 %{_sbindir}/*
172 173
 %config(noreplace) /etc/pam.d/*
173 174
 %config(noreplace) /etc/security/console.apps/*
175
+%{_datadir}/config*/*
176
+%{_datadir}/mimelnk/*/*.desktop
177
+%{_datadir}/icons/crystalsvg/*/*/*
174 178
 %endif
175 179
 %{_datadir}/apps/*
176 180
 %{_datadir}/applications/kde/*.desktop
177
-%{_datadir}/config*/*
178
-%{_datadir}/icons/crystalsvg/*/*/*
179 181
 %{_datadir}/icons/hicolor/*/*/*
180 182
 %{_datadir}/icons/locolor/*/*/*
181
-%{_datadir}/mimelnk/*/*.desktop
182 183
 %{_datadir}/service*/*.desktop
183 184
 %{tde_libdir}/*
184 185
 %{_libdir}/pkgconfig/*.pc
185 186
 
186 187
 
188
+
189
+
187 190
 %changelog
191
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
192
+- Add support for RHEL5
193
+
188 194
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
189 195
 - Initial build for RHEL 6
190 196
 - Spec file based on Fedora 8 "kdeadmin-3.5.10-1"

+ 10
- 3
redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 4
5
+%define release 5
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -28,6 +28,9 @@ Vendor:		Trinity Project
28 28
 Packager:	Francois Andriot <francois.andriot@free.fr>
29 29
 Url:		http://www.trinitydesktop.org/
30 30
 
31
+Prefix:		%{_prefix}
32
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
33
+
31 34
 Source: kdeartwork-%{version}.tar.gz
32 35
 
33 36
 # FIXME: this should go in kde-settings -- Rex
@@ -37,6 +40,8 @@ BuildRequires: gettext
37 40
 BuildRequires: trinity-kdebase-devel
38 41
 BuildRequires: libart_lgpl-devel
39 42
 BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
43
+BuildRequires:	xscreensaver-extras xscreensaver-gl-base
44
+
40 45
 
41 46
 Requires: trinity-kdebase
42 47
 
@@ -79,8 +84,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
79 84
 %install
80 85
 export PATH="%{_bindir}:${PATH}"
81 86
 %__rm -rf %{buildroot}
82
-
83
-%make_install
87
+%__make install DESTDIR=%{buildroot}
84 88
 
85 89
 # webcollage -root -directory /usr/share/backgrounds/images #227683
86 90
 
@@ -165,6 +169,9 @@ done
165 169
 
166 170
 
167 171
 %changelog
172
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
173
+- Add support for RHEL5
174
+
168 175
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
169 176
 - Import to GIT
170 177
 

+ 36
- 0
redhat/kdebase/kdebase-3.5.12-disable-krandr.patch View File

@@ -0,0 +1,36 @@
1
+*** kdebase/kcontrol/Makefile.am.ORI	2011-09-18 22:04:50.000000000 +0200
2
+--- kdebase/kcontrol/Makefile.am	2011-09-18 22:05:00.000000000 +0200
3
+***************
4
+*** 12,18 ****
5
+  endif
6
+  
7
+  if include_kcontrol_iccconfig
8
+! ICCCONFIG_SUBDIR=iccconfig
9
+  endif
10
+  
11
+  if include_kcontrol_usbview
12
+--- 12,18 ----
13
+  endif
14
+  
15
+  if include_kcontrol_iccconfig
16
+! #ICCCONFIG_SUBDIR=iccconfig
17
+  endif
18
+  
19
+  if include_kcontrol_usbview
20
+***************
21
+*** 24,30 ****
22
+  endif
23
+  
24
+  if include_kcontrol_randr
25
+! RANDR_SUBDIR=randr
26
+  endif
27
+  
28
+  if include_kcontrol_joystick
29
+--- 24,30 ----
30
+  endif
31
+  
32
+  if include_kcontrol_randr
33
+! #RANDR_SUBDIR=randr
34
+  endif
35
+  
36
+  if include_kcontrol_joystick

+ 16
- 3
redhat/kdeedu/trinity-kdeedu-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -29,7 +29,9 @@ Vendor:		Trinity Project
29 29
 Packager:	Francois Andriot <francois.andriot@free.fr>
30 30
 URL:		http://www.trinitydesktop.org/
31 31
 
32
+Prefix:    %{_prefix}
32 33
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
34
+
33 35
 Source0: kdeedu-%{version}.tar.gz
34 36
 
35 37
 Provides: kdeedu3 = %{version}-%{release}
@@ -43,7 +45,11 @@ BuildRequires: desktop-file-utils
43 45
 BuildRequires: trinity-kdelibs-devel
44 46
 BuildRequires: python-devel python
45 47
 BuildRequires: boost-devel
48
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
46 49
 BuildRequires: ocaml(compiler)
50
+%else
51
+BuildRequires: ocaml
52
+%endif
47 53
 #BuildRequires: ocaml-facile-devel
48 54
 
49 55
 
@@ -116,7 +122,11 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
116 122
    --enable-new-ldflags \
117 123
    --disable-dependency-tracking \
118 124
    --disable-rpath \
125
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
119 126
    --enable-kig-python-scripting \
127
+%else
128
+   --disable-kig-python-scripting \
129
+%endif
120 130
    --disable-debug \
121 131
    --disable-warnings \
122 132
    --enable-final \
@@ -126,14 +136,14 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
126 136
    --with-extra-includes=%{_includedir}/tqt
127 137
 
128 138
 
129
-%__make %{?_smp_mflags} \
139
+%__make \
130 140
   OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
131 141
 
132 142
 
133 143
 %install
134 144
 export PATH="%{_bindir}:${PATH}"
135 145
 %__rm -rf %{buildroot}
136
-%make_install
146
+%__make install DESTDIR=%{buildroot}
137 147
 
138 148
 # locale's
139 149
 %find_lang %{name} || touch %{name}.lang
@@ -214,6 +224,9 @@ update-desktop-database >& /dev/null ||:
214 224
 
215 225
 
216 226
 %changelog
227
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
228
+- Add support for RHEL5
229
+
217 230
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
218 231
 - Initial build for RHEL 6
219 232
 - Spec file based on Fedora 8 "kdeedu-3.5.10-1"

+ 7
- 2
redhat/kdegames/trinity-kdegames-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -29,7 +29,9 @@ Vendor:		Trinity Project
29 29
 Packager:	Francois Andriot <francois.andriot@free.fr>
30 30
 URL:		http://www.trinitydesktop.org/
31 31
 
32
+Prefix:    %{_prefix}
32 33
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
34
+
33 35
 Source: kdegames-%{version}.tar.gz
34 36
 
35 37
 Provides: kdegames3 = %{version}-%{release}
@@ -102,7 +104,7 @@ export CXXFLAGS="${CXXFLAGS} -lkio"
102 104
 %install
103 105
 export PATH="%{_bindir}:${PATH}"
104 106
 %__rm -rf %{buildroot}
105
-%make_install
107
+%__make install DESTDIR=%{buildroot}
106 108
 
107 109
 # locale's
108 110
 %find_lang %{name} || touch %{name}.lang
@@ -183,6 +185,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
183 185
 
184 186
 
185 187
 %changelog
188
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
189
+- Add support for RHEL5
190
+
186 191
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
187 192
 - Initial build for RHEL 6
188 193
 - Spec file based on Fedora 8 "kdegames-3.5.10-1"

+ 13
- 3
redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 2
5
+%define release 3
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -24,12 +24,14 @@ License:	GPL
24 24
 Summary:    K Desktop Environment - Graphics Applications
25 25
 
26 26
 Group:      Applications/Multimedia
27
-Prefix:		%{_prefix}
28 27
 
29 28
 Vendor:		Trinity Project
30 29
 Packager:	Francois Andriot <francois.andriot@free.fr>
31 30
 URL:		http://www.trinitydesktop.org/
32 31
 
32
+Prefix:		%{_prefix}
33
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
34
+
33 35
 Source0:	kdegraphics-%{version}.tar.gz
34 36
 
35 37
 # Official TDE patches (from SVN)
@@ -54,6 +56,7 @@ BuildRequires: gphoto2-devel
54 56
 BuildRequires: sane-backends-devel
55 57
 BuildRequires: libusb-devel
56 58
 
59
+
57 60
 # kgamma
58 61
 BuildRequires: libXxf86vm-devel
59 62
 # kuickshow
@@ -62,7 +65,11 @@ BuildRequires: imlib-devel
62 65
 BuildRequires: OpenEXR-devel
63 66
 # kpdf
64 67
 BuildRequires: freetype-devel
68
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
65 69
 BuildRequires: poppler-qt-devel
70
+%else
71
+BuildRequires: poppler-devel
72
+%endif
66 73
 BuildRequires: libpaper-devel
67 74
 # ksvg
68 75
 BuildRequires: fontconfig-devel
@@ -171,7 +178,7 @@ sed -i kpdf/Makefile \
171 178
 export PATH="%{_bindir}:${PATH}"
172 179
 %__rm -rf %{buildroot}
173 180
 
174
-make install DESTDIR=%{buildroot}
181
+%__make install DESTDIR=%{buildroot}
175 182
 
176 183
 # locale's
177 184
 %find_lang %{name} || touch %{name}.lang
@@ -344,6 +351,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
344 351
 %exclude %{_libdir}/libdjvu.so
345 352
 
346 353
 %changelog
354
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
355
+- Add support for RHEL5
356
+
347 357
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 
348 358
 - Import to GIT
349 359
 

+ 14
- 16
redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -38,15 +38,17 @@ Vendor:		Trinity Project
38 38
 Packager:	Francois Andriot <francois.andriot@free.fr>
39 39
 URL:		http://www.trinitydesktop.org/
40 40
 
41
-Source0: kdemultimedia-%{version}.tar.gz
42
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41
+Prefix:		%{_prefix}
42
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
43 43
 
44
-Provides: kdemultimedia3 = %{version}-%{release}
44
+Source0: kdemultimedia-%{version}.tar.gz
45 45
 
46 46
 # RedHat Legacy patches (from Fedora 8)
47 47
 Patch3: kdemultimedia-3.4.0-xdg.patch
48 48
 Patch5: kdemultimedia-3.5.7-pthread.patch
49 49
 
50
+Provides: kdemultimedia3 = %{version}-%{release}
51
+
50 52
 Requires: %{name}-libs = %{version}-%{release}
51 53
 
52 54
 BuildRequires: zlib-devel
@@ -64,6 +66,8 @@ BuildRequires: automake libtool
64 66
 %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
65 67
 %{?_with_taglib:BuildRequires: taglib-devel}
66 68
 %{?_with_xine:BuildRequires: xine-lib-devel}
69
+BuildRequires:	libXxf86dga-devel
70
+BuildRequires:	libXxf86vm-devel
67 71
 
68 72
 %description
69 73
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -93,14 +97,7 @@ noatun plugins.
93 97
 %package extras
94 98
 Summary: Extra applications from %{name} 
95 99
 Group: Applications/Multimedia
96
-%if 0%{?libs}
97 100
 Requires: %{name}-extras-libs = %{version}-%{release}
98
-%else
99
-Obsoletes: %{name}-extras-libs < %{version}-%{release}
100
-Provides:  %{name}-extras-libs = %{version}-%{release}
101
-Requires(post): /sbin/ldconfig
102
-Requires(postun): /sbin/ldconfig
103
-%endif
104 101
 %description extras
105 102
 %{summary}, including:
106 103
  * juk, a media player
@@ -169,10 +166,10 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP"
169 166
 
170 167
 %install
171 168
 export PATH="%{_bindir}:${PATH}"
172
-%__rm -rf %{buildroot} 
169
+%__rm -rf %{?buildroot} 
173 170
 
174
-%make_install
175
-%make_install -C kaudiocreator
171
+%__make install DESTDIR=%{?buildroot} 
172
+%__make install DESTDIR=%{?buildroot}  -C kaudiocreator
176 173
 
177 174
 ## Remove/uninstall (conflicting) bits we don't want
178 175
 rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
@@ -220,7 +217,6 @@ done
220 217
 
221 218
 
222 219
 %post
223
-%{?libs:/sbin/ldconfig}
224 220
 for f in crystalsvg hicolor locolor ; do
225 221
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
226 222
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -228,7 +224,6 @@ done
228 224
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
229 225
 
230 226
 %postun
231
-%{?libs:/sbin/ldconfig}
232 227
 for f in crystalsvg hicolor locolor ; do
233 228
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
234 229
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -384,6 +379,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
384 379
 
385 380
 
386 381
 %changelog
382
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
383
+- Add support for RHEL5
384
+
387 385
 * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
388 386
 - Initial build for RHEL 6
389 387
 - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"

+ 11
- 4
redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 4
5
+%define release 5
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -43,7 +43,9 @@ URL:		http://www.trinitydesktop.org/
43 43
 
44 44
 License: GPLv2
45 45
 Group:   Applications/Internet
46
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
46
+
47
+Prefix:		%{_prefix}
48
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
47 49
 
48 50
 Provides: kdenetwork3 = %{version}-%{release}
49 51
 
@@ -110,7 +112,9 @@ Requires(post):   chkconfig
110 112
 #Requires(hint): samba-client
111 113
 BuildRequires:  avahi-qt3-devel
112 114
 
115
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
113 116
 BuildRequires:	libv4l-devel
117
+%endif
114 118
 
115 119
 %if 0%{?console_helper}
116 120
 Requires: usermode-gtk
@@ -211,9 +215,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
211 215
 export PATH="%{_bindir}:${PATH}"
212 216
 %__rm -rf %{buildroot}
213 217
 
214
-%make_install
218
+%__make install DESTDIR=%{buildroot}
215 219
 # RHEL6: kppp seems to be not installed by previous command ???
216
-%make_install -C kppp
220
+%__make install DESTDIR=%{buildroot} -C kppp
217 221
 
218 222
 
219 223
 ## File lists
@@ -477,6 +481,9 @@ done
477 481
 
478 482
 
479 483
 %changelog
484
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
485
+- Add support for RHEL5
486
+
480 487
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
481 488
 - Import to GIT
482 489
 

+ 7
- 2
redhat/kdepim/trinity-kdepim-3.5.12.spec View File

@@ -1,7 +1,7 @@
1 1
 # Default version for this component
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4
-%define release 5
4
+%define release 6
5 5
 %endif
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -29,6 +29,7 @@ Summary:	PIM (Personal Information Manager) applications
29 29
 Prefix:		%{_prefix}
30 30
 
31 31
 Source0:	kdepim-%{version}.tar.gz
32
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
32 33
 
33 34
 # TDE official patches from SVN, unmodified
34 35
 # Attempt to fix a kdepim FTBFS based on a missing stdc header #include
@@ -56,6 +57,7 @@ PIM (Personal Information Manager) applications.
56 57
 %package devel
57 58
 Requires:	%{name}
58 59
 Summary:	%{name} - Development files
60
+Group: Development/Libraries
59 61
 %description devel
60 62
 Development files for %{name}.
61 63
 
@@ -86,7 +88,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
86 88
 %install
87 89
 export PATH="%{_bindir}:${PATH}"
88 90
 %__rm -rf %{?buildroot}
89
-%make_install
91
+%__make install DESTDIR=%{?buildroot}
90 92
 
91 93
 %clean
92 94
 %__rm -rf %{?buildroot}
@@ -125,6 +127,9 @@ export PATH="%{_bindir}:${PATH}"
125 127
 %exclude %{_libdir}/libkmailprivate.so
126 128
 
127 129
 %changelog
130
+* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
131
+- Add RHEL5 support
132
+
128 133
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
129 134
 - Import to GIT
130 135
 

+ 9
- 3
redhat/kdesdk/trinity-kdesdk-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 2
5
+%define release 3
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -33,7 +33,10 @@ Group: User Interface/Desktops
33 33
 URL:		http://www.trinitydesktop.org/
34 34
 Vendor: Trinity Project
35 35
 Packager: Francois Andriot <francois.andriot@free.fr>
36
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
36
+
37
+Prefix:		%{_prefix}
38
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
39
+
37 40
 Source: kdesdk-%{version}.tar.gz
38 41
 
39 42
 # RedHat Legacy patches
@@ -139,7 +142,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
139 142
 export PATH="%{_bindir}:${PATH}"
140 143
 %__rm -rf %{buildroot} 
141 144
 
142
-%make_install
145
+%__make install DESTDIR=%{?buildroot}
143 146
 
144 147
 desktop-file-install --vendor "" \
145 148
   --dir %{buildroot}%{_datadir}/applications/kde \
@@ -226,6 +229,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
226 229
 
227 230
 
228 231
 %changelog
232
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
233
+- Add support for RHEL5
234
+
229 235
 * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
230 236
 - Import to GIT
231 237
 

+ 6
- 4
redhat/kdetoys/trinity-kdetoys-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 3
5
+%define release 4
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -25,20 +25,19 @@ Release: %{?release}%{?dist}%{?_variant}
25 25
 
26 26
 License: GPLv2+
27 27
 Source0: kdetoys-%{version}.tar.gz
28
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
29 28
 
30 29
 Vendor:		Trinity Project
31 30
 Packager:	Francois Andriot <francois.andriot@free.fr>
32 31
 URL:		http://www.trinitydesktop.org/
33 32
 
34 33
 Prefix:		%{_prefix}
34
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
35 35
 
36 36
 BuildRequires: desktop-file-utils
37 37
 BuildRequires: tqtinterface-devel >= %{version}
38 38
 BuildRequires: trinity-kdelibs-devel >= %{version}
39 39
 BuildRequires: gettext
40 40
 
41
-#Requires(hint): kdebase3 >= %{version}
42 41
 
43 42
 %description
44 43
 Includes: 
@@ -84,7 +83,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
84 83
 %install
85 84
 export PATH="%{_bindir}:${PATH}"
86 85
 %__rm -rf "%{buildroot}"
87
-%make_install
86
+%__make install DESTDIR=%{buildroot}
88 87
 
89 88
 desktop-file-install \
90 89
   --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
@@ -151,6 +150,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
151 150
 
152 151
 
153 152
 %changelog
153
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
154
+- Add support for RHEL5
155
+
154 156
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
155 157
 - Import to GIT
156 158
 

+ 7
- 3
redhat/kdeutils/trinity-kdeutils-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 6
5
+%define release 7
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -29,6 +29,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
29 29
 URL:		http://www.trinitydesktop.org/
30 30
 
31 31
 Prefix:		%{_prefix}
32
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
32 33
 
33 34
 Source0:	kdeutils-%{version}.tar.gz
34 35
 Source1: klaptop_acpi_helper.pam
@@ -134,7 +135,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
134 135
 %install
135 136
 export PATH="%{_bindir}:${PATH}"
136 137
 %__rm -rf %{?buildroot}
137
-%make_install
138
+%__make install DESTDIR=%{?buildroot}
138 139
 
139 140
 # Show only in KDE (really? -- Rex)
140 141
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
@@ -316,7 +317,7 @@ done
316 317
 %{_datadir}/services/*
317 318
 %{_datadir}/servicetypes/*
318 319
 %{_datadir}/applications/kde/*
319
-%if 0%{?rhel} >= 6
320
+%if 0%{?rhel} >= 5
320 321
 %{_datadir}/applnk/Utilities/*
321 322
 %{_datadir}/mimelnk/application/*
322 323
 %endif
@@ -333,6 +334,9 @@ done
333 334
 
334 335
 
335 336
 %changelog
337
+* Sun Sep 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
338
+- Add RHEL5 support
339
+
336 340
 * Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
337 341
 - Merge Spec file from Fedora8 "kdeutils-3.5.10-6"
338 342
 

+ 12
- 5
redhat/kdevelop/trinity-kdevelop-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -33,7 +33,8 @@ Vendor:		Trinity Project
33 33
 Packager:	Francois Andriot <francois.andriot@free.fr>
34 34
 URL:		http://www.trinitydesktop.org/
35 35
 
36
-Prefix:	%{_prefix}
36
+Prefix:		%{_prefix}
37
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
37 38
 
38 39
 Source: kdevelop-%{version}.tar.gz
39 40
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
@@ -65,7 +66,7 @@ BuildRequires: trinity-kdelibs-devel
65 66
 BuildRequires: trinity-kdelibs-apidocs
66 67
 BuildRequires: qt3-devel-docs
67 68
 BuildRequires: db4-devel
68
-BuildRequires: flex flex-static
69
+BuildRequires: flex
69 70
 BuildRequires: pcre-devel
70 71
 BuildRequires: libacl-devel libattr-devel libidn-devel libart_lgpl-devel
71 72
 BuildRequires: gcc-c++
@@ -76,6 +77,9 @@ BuildRequires: subversion-devel neon-devel
76 77
 # looks like this is dragged in by apr-devel (dep of subversion-devel), but not
77 78
 # a dependency
78 79
 BuildRequires: openldap-devel
80
+%if 0%{?fedora} >= 15
81
+BuildRequires: flex-static
82
+%endif
79 83
 
80 84
 %description
81 85
 The KDevelop Integrated Development Environment provides many features
@@ -181,8 +185,8 @@ popd
181 185
 %install
182 186
 %__rm -rf %{buildroot}
183 187
 
184
-%make_install
185
-%make_install -C c_cpp_reference-2.0.2_for_KDE_3.0
188
+%__make install DESTDIR=%{buildroot}
189
+%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
186 190
 
187 191
 # remove useless files
188 192
 %__rm -rf %{buildroot}%{_prefix}/kdevbdb
@@ -240,6 +244,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
240 244
 
241 245
 
242 246
 %changelog
247
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
248
+- Add support for RHEL5
249
+
243 250
 * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
244 251
 - Initial build for RHEL 6
245 252
 - Spec file based on Fedora 8 "kdeedu-3.5.3-1"

+ 6
- 2
redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec View File

@@ -2,7 +2,7 @@
2 2
 %if "%{?version}" == ""
3 3
 %define version 3.5.12
4 4
 %endif
5
-%define release 1
5
+%define release 2
6 6
 
7 7
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
8 8
 %if "%{?_prefix}" != "/usr"
@@ -28,6 +28,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
28 28
 URL:		http://www.trinitydesktop.org/
29 29
 
30 30
 Prefix:		%{_prefix}
31
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
31 32
 
32 33
 Source0:	kdewebdev-%{version}.tar.gz
33 34
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
@@ -127,7 +128,7 @@ export CXXFLAGS="${CXXFLAGS} -fpermissive"
127 128
 %install
128 129
 export PATH="%{_bindir}:${PATH}"
129 130
 %__rm -rf %{?buildroot}
130
-%make_install
131
+%__make install DESTDIR=%{?buildroot}
131 132
 
132 133
 
133 134
 ## package separately?  Why doesn't upstream include this? -- Rex
@@ -216,6 +217,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
216 217
 
217 218
 
218 219
 %changelog
220
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
221
+- Add support for RHEL5
222
+
219 223
 * Thu Sep 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
220 224
 - Initial build for RHEL 6 / Fedora 15
221 225
 - Use Spec file from Fedora8 "kdewebdev-3.5.10-1"

Loading…
Cancel
Save