Overview

Request 5628 (accepted)

No description set
Submit package Staging / vlc-beta to package Essentials / vlc-beta

vlc-beta.spec Changed
x
 
1
@@ -17,7 +17,7 @@
2
 
3
 
4
 %global  _buildshell /bin/bash
5
-%global __provides_exclude_from ^%_libdir/.*\\.so(|\\.0-9.*)$
6
+%global __provides_exclude_from ^%_libdir/%name/.*\\.so(|\\.0-9.*)$
7
 %bcond_with    vlc_opencv
8
 %bcond_with    fdk_aac
9
 %ifarch %arm
10
@@ -32,9 +32,9 @@
11
 License:        GPL-2.0+ and LGPL-2.1+
12
 Group:          Productivity/Multimedia/Video/Players
13
 Url:            http://www.videolan.org
14
-Source0:        %{name}-%{version}.tar
15
-Source1:        %{name}.changes
16
-Source3:        %{name}-rpmlintrc
17
+Source0:        %name-%version.tar
18
+Source1:        %name.changes
19
+Source3:        %name-rpmlintrc
20
 Patch0:         vlc-beta.patch
21
 Patch1:         vlc.a52dec.patch
22
 Patch2:         vlc.hostname.patch
23
@@ -45,69 +45,69 @@
24
 %endif
25
 
26
 # avoid stale debug.rpm
27
-Conflicts:      %{name}-debuginfo < %{version}-%{release} 
28
-Conflicts:      %{name}-debugsource < %{version}-%{release} 
29
+Conflicts:      %name-debuginfo < %version-%release 
30
+Conflicts:      %name-debugsource < %version-%release 
31
 #
32
 Conflicts:      vlc
33
 Conflicts:      vlc-devel
34
 Conflicts:      vlc-qt
35
-Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
36
-Obsoletes:      vlc-codec-gstreamer-debuginfo < %{version}-%{release}
37
-Obsoletes:      vlc-codecs < %{version}-%{release}
38
-Obsoletes:      vlc-codecs-debuginfo < %{version}-%{release}
39
-Obsoletes:      vlc-debuginfo < %{version}-%{release}
40
-Obsoletes:      vlc-debugsource < %{version}-%{release}
41
-Obsoletes:      vlc-devel < %{version}-%{release}
42
-Obsoletes:      vlc-jack < %{version}-%{release}
43
-Obsoletes:      vlc-jack-debuginfo < %{version}-%{release}
44
-Obsoletes:      vlc-lang < %{version}-%{release}
45
-Obsoletes:      vlc-noX < %{version}-%{release}
46
-Obsoletes:      vlc-noX-debuginfo < %{version}-%{release}
47
-Obsoletes:      vlc-opencv < %{version}-%{release}
48
-Obsoletes:      vlc-opencv-debuginfo < %{version}-%{release}
49
-Obsoletes:      vlc-qt < %{version}-%{release}
50
-Obsoletes:      vlc-qt-debuginfo < %{version}-%{release}
51
-Obsoletes:      vlc-vdpau < %{version}-%{release}
52
-Obsoletes:      vlc-vdpau-debuginfo < %{version}-%{release}
53
-Provides:       vlc-codec-gstreamer = %{version}-%{release}
54
-Provides:       vlc-codec-gstreamer-debuginfo = %{version}-%{release}
55
-Provides:       vlc-codecs = %{version}-%{release}
56
-Provides:       vlc-codecs-debuginfo = %{version}-%{release}
57
-Provides:       vlc-debuginfo = %{version}-%{release}
58
-Provides:       vlc-debugsource = %{version}-%{release}
59
-Provides:       vlc-devel = %{version}-%{release}
60
-Provides:       vlc-jack = %{version}-%{release}
61
-Provides:       vlc-jack-debuginfo = %{version}-%{release}
62
-Provides:       vlc-lang = %{version}-%{release}
63
-Provides:       vlc-noX = %{version}-%{release}
64
-Provides:       vlc-noX-debuginfo = %{version}-%{release}
65
-Provides:       vlc-opencv = %{version}-%{release}
66
-Provides:       vlc-opencv-debuginfo = %{version}-%{release}
67
-Provides:       vlc-qt = %{version}-%{release}
68
-Provides:       vlc-qt-debuginfo = %{version}-%{release}
69
-Provides:       vlc-vdpau = %{version}-%{release}
70
-Provides:       vlc-vdpau-debuginfo = %{version}-%{release}
71
+Obsoletes:      vlc-codec-gstreamer < %version-%release
72
+Obsoletes:      vlc-codec-gstreamer-debuginfo < %version-%release
73
+Obsoletes:      vlc-codecs < %version-%release
74
+Obsoletes:      vlc-codecs-debuginfo < %version-%release
75
+Obsoletes:      vlc-debuginfo < %version-%release
76
+Obsoletes:      vlc-debugsource < %version-%release
77
+Obsoletes:      vlc-devel < %version-%release
78
+Obsoletes:      vlc-jack < %version-%release
79
+Obsoletes:      vlc-jack-debuginfo < %version-%release
80
+Obsoletes:      vlc-lang < %version-%release
81
+Obsoletes:      vlc-noX < %version-%release
82
+Obsoletes:      vlc-noX-debuginfo < %version-%release
83
+Obsoletes:      vlc-opencv < %version-%release
84
+Obsoletes:      vlc-opencv-debuginfo < %version-%release
85
+Obsoletes:      vlc-qt < %version-%release
86
+Obsoletes:      vlc-qt-debuginfo < %version-%release
87
+Obsoletes:      vlc-vdpau < %version-%release
88
+Obsoletes:      vlc-vdpau-debuginfo < %version-%release
89
+Provides:       vlc-codec-gstreamer = %version-%release
90
+Provides:       vlc-codec-gstreamer-debuginfo = %version-%release
91
+Provides:       vlc-codecs = %version-%release
92
+Provides:       vlc-codecs-debuginfo = %version-%release
93
+Provides:       vlc-debuginfo = %version-%release
94
+Provides:       vlc-debugsource = %version-%release
95
+Provides:       vlc-devel = %version-%release
96
+Provides:       vlc-jack = %version-%release
97
+Provides:       vlc-jack-debuginfo = %version-%release
98
+Provides:       vlc-lang = %version-%release
99
+Provides:       vlc-noX = %version-%release
100
+Provides:       vlc-noX-debuginfo = %version-%release
101
+Provides:       vlc-opencv = %version-%release
102
+Provides:       vlc-opencv-debuginfo = %version-%release
103
+Provides:       vlc-qt = %version-%release
104
+Provides:       vlc-qt-debuginfo = %version-%release
105
+Provides:       vlc-vdpau = %version-%release
106
+Provides:       vlc-vdpau-debuginfo = %version-%release
107
 
108
-Obsoletes:      libvlc123 < %{version}-%{release}
109
-Obsoletes:      libvlc123-debuginfo < %{version}-%{release}
110
-Obsoletes:      libvlccore123 < %{version}-%{release}
111
-Obsoletes:      libvlccore123-debuginfo < %{version}-%{release}
112
-Obsoletes:      vlc-beta-devel < %{version}-%{release}
113
-Obsoletes:      vlc-beta-noX < %{version}-%{release}
114
-Obsoletes:      vlc-beta-noX-debuginfo < %{version}-%{release}
115
-Obsoletes:      vlc-beta-noX-lang < %{version}-%{release}
116
-Obsoletes:      vlc-beta-qt < %{version}-%{release}
117
-Obsoletes:      vlc-beta-qt-debuginfo < %{version}-%{release}
118
-Provides:       libvlc123 = %{version}-%{release}
119
-Provides:       libvlc123-debuginfo = %{version}-%{release}
120
-Provides:       libvlccore123 = %{version}-%{release}
121
-Provides:       libvlccore123-debuginfo = %{version}-%{release}
122
-Provides:       vlc-beta-devel = %{version}-%{release}
123
-Provides:       vlc-beta-noX = %{version}-%{release}
124
-Provides:       vlc-beta-noX-debuginfo = %{version}-%{release}
125
-Provides:       vlc-beta-noX-lang = %{version}-%{release}
126
-Provides:       vlc-beta-qt = %{version}-%{release}
127
-Provides:       vlc-beta-qt-debuginfo = %{version}-%{release}
128
+Obsoletes:      libvlc123 < %version-%release
129
+Obsoletes:      libvlc123-debuginfo < %version-%release
130
+Obsoletes:      libvlccore123 < %version-%release
131
+Obsoletes:      libvlccore123-debuginfo < %version-%release
132
+Obsoletes:      vlc-beta-devel < %version-%release
133
+Obsoletes:      vlc-beta-noX < %version-%release
134
+Obsoletes:      vlc-beta-noX-debuginfo < %version-%release
135
+Obsoletes:      vlc-beta-noX-lang < %version-%release
136
+Obsoletes:      vlc-beta-qt < %version-%release
137
+Obsoletes:      vlc-beta-qt-debuginfo < %version-%release
138
+Provides:       libvlc123 = %version-%release
139
+Provides:       libvlc123-debuginfo = %version-%release
140
+Provides:       libvlccore123 = %version-%release
141
+Provides:       libvlccore123-debuginfo = %version-%release
142
+Provides:       vlc-beta-devel = %version-%release
143
+Provides:       vlc-beta-noX = %version-%release
144
+Provides:       vlc-beta-noX-debuginfo = %version-%release
145
+Provides:       vlc-beta-noX-lang = %version-%release
146
+Provides:       vlc-beta-qt = %version-%release
147
+Provides:       vlc-beta-qt-debuginfo = %version-%release
148
 
149
 BuildRequires:  bash
150
 BuildRequires:  gcc
151
@@ -275,10 +275,10 @@
152
 %build
153
 head -n 123 /proc/cpuinfo /proc/cmdline || :
154
 uname -a
155
-VERSION=%{version}
156
+VERSION=%version
157
 echo "${VERSION##*.}" > ./src/revision.txt
158
 sed -i~ "
159
-s@^AC_INIT.*@AC_INIT(%{name}, ${VERSION%%.*})@
160
+s@^AC_INIT.*@AC_INIT(%name, ${VERSION%%.*})@
161
 s@^VERSION_MAJOR=.@VERSION_MAJOR=${VERSION:0:2}@
162
 s@^VERSION_MINOR=.@VERSION_MINOR=${VERSION:2:2}@
163
 s@^VERSION_REVISION=.@VERSION_REVISION=${VERSION:4:2}@
164
@@ -307,8 +307,8 @@
165
 export BUILDCC="$(readlink -f ${BUILDCC})"
166
 export CC="$(readlink -f ${CC})"
167
 export CXX="$(readlink -f ${CXX})"
168
-CFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
169
-CXXFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
170
+CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
171
+CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
172
 ./bootstrap
173
 %configure --help
174
 %configure \
175
@@ -444,8 +444,8 @@
176
    --enable-fribidi \
177
    --enable-harfbuzz \
178
    --enable-fontconfig \
179
-   --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
180
-   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
181
+   --with-default-font=%_datadir/fonts/truetype/FreeSerifBold.ttf \
182
+   --with-default-monospace-font=%_datadir/fonts/truetype/FreeMono.ttf \
183
    --enable-svg \
184
    --enable-svgdec \
185
    --disable-directx \
186
@@ -499,7 +499,7 @@
187
 %endif
188
    --enable-vulkan \
189
    --disable-medialibrary \
190
-   --with-kde-solid=%{_datadir}/kde4/apps/solid \
191
+   --with-kde-solid=%_datadir/kde4/apps/solid \
192
    --enable-vlc \
193
 %if 0%{?suse_version} > 1500
194
    --enable-nls \
195
@@ -510,85 +510,85 @@
196
 
197
 %install
198
 %make_install
199
-mkdir -p %{buildroot}/%{_datadir}/pixmaps
200
-ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
201
-find %{buildroot} -type f -name "*.la" -delete -print
202
-find %{buildroot} -type f -name "*.a" -delete -print
203
-rm -rfv %{buildroot}%{_datadir}/macosx
204
-rm -rfv %{buildroot}%{_datadir}/doc
205
+mkdir -p %buildroot/%_datadir/pixmaps
206
+ln -s %_datadir/icons/hicolor/48x48/apps/vlc.png %buildroot/%_datadir/pixmaps/vlc.png
207
+find %buildroot -type f -name "*.la" -delete -print
208
+find %buildroot -type f -name "*.a" -delete -print
209
+rm -rfv %buildroot%_datadir/macosx
210
+rm -rfv %buildroot%_datadir/doc
211
 %suse_update_desktop_file vlc AudioVideo Audio Video Player
212
-%fdupes %{buildroot}
213
+%fdupes %buildroot
214
 # add missing manfiles
215
 for i in ?vlc; do
216
-    pushd %{buildroot}/%{_mandir}/man1
217
+    pushd %buildroot/%_mandir/man1
218
     ln -s vlc.1 $i.1
219
     popd
220
 done
221
-> %{name}.lang
222
+> %name.lang
223
 %if 0%{?suse_version} > 1500
224
-%find_lang %{name}
225
+%find_lang %name
226
 %endif
227
-ls -l %{buildroot}/%{_libdir}/%{name}/plugins/plugins.dat
228
-> %{buildroot}/%{_libdir}/%{name}/plugins/plugins.dat
229
+ls -l %buildroot/%_libdir/%name/plugins/plugins.dat
230
+> %buildroot/%_libdir/%name/plugins/plugins.dat
231
 
232
 %post -p /sbin/ldconfig
233
 
234
 %postun -p /sbin/ldconfig
235
 
236
 %posttrans
237
-%{_libexecdir}/%{name}/vlc-cache-gen %{_libdir}/%{name}/plugins
238
+%_libexecdir/%name/vlc-cache-gen %_libdir/%name/plugins
239
 
240
-%files -f %{name}.lang
241
-%dir %{_libdir}/%{name}/
242
-%dir %{_libdir}/%{name}/plugins
243
-%dir %{_libdir}/%{name}/plugins/access
244
-%dir %{_libdir}/%{name}/plugins/access/rtp
245
-%dir %{_libdir}/%{name}/plugins/access_output
246
-%dir %{_libdir}/%{name}/plugins/audio_filter
247
-%dir %{_libdir}/%{name}/plugins/audio_mixer
248
-%dir %{_libdir}/%{name}/plugins/audio_output
249
-%dir %{_libdir}/%{name}/plugins/codec
250
-%dir %{_libdir}/%{name}/plugins/control
251
-%dir %{_libdir}/%{name}/plugins/demux
252
-%dir %{_libdir}/%{name}/plugins/gui
253
-%dir %{_libdir}/%{name}/plugins/keystore
254
-%dir %{_libdir}/%{name}/plugins/logger
255
-%dir %{_libdir}/%{name}/plugins/lua
256
-%dir %{_libdir}/%{name}/plugins/meta_engine
257
-%dir %{_libdir}/%{name}/plugins/misc
258
-%dir %{_libdir}/%{name}/plugins/mux
259
-%dir %{_libdir}/%{name}/plugins/notify
260
-%dir %{_libdir}/%{name}/plugins/packetizer
261
-%dir %{_libdir}/%{name}/plugins/services_discovery
262
-%dir %{_libdir}/%{name}/plugins/spu
263
-%dir %{_libdir}/%{name}/plugins/stream_extractor
264
-%dir %{_libdir}/%{name}/plugins/stream_filter
265
-%dir %{_libdir}/%{name}/plugins/stream_out
266
-%dir %{_libdir}/%{name}/plugins/text_renderer
267
-%dir %{_libdir}/%{name}/plugins/vaapi
268
-%dir %{_libdir}/%{name}/plugins/vdpau
269
-%dir %{_libdir}/%{name}/plugins/video_chroma
270
-%dir %{_libdir}/%{name}/plugins/video_filter
271
-%dir %{_libdir}/%{name}/plugins/video_output
272
-%dir %{_libdir}/%{name}/plugins/video_splitter
273
-%dir %{_libdir}/%{name}/plugins/visualization
274
-%ghost %{_libdir}/%{name}/plugins/*.dat
275
-%{_bindir}/*
276
-%{_datadir}/%{name}/
277
-%{_datadir}/applications/*
278
-%{_datadir}/icons/*
279
-%{_datadir}/kde4
280
-%{_datadir}/metainfo/*
281
-%{_datadir}/pixmaps/*
282
-%{_includedir}/*
283
-%{_libdir}/%{name}/*.so
284
-%{_libdir}/%{name}/*.so.*
285
-%{_libdir}/%{name}/plugins/*/*.so
286
-%{_libdir}/%{name}/plugins/*/*/*.so
287
-%{_libdir}/*.so
288
-%{_libdir}/*.so.*
289
-%{_libdir}/pkgconfig/*.pc
290
-%{_libexecdir}/%{name}
291
-%{_mandir}/*/*
292
+%files -f %name.lang
293
+%dir %_libdir/%name/
294
+%dir %_libdir/%name/plugins
295
+%dir %_libdir/%name/plugins/access
296
+%dir %_libdir/%name/plugins/access/rtp
297
+%dir %_libdir/%name/plugins/access_output
298
+%dir %_libdir/%name/plugins/audio_filter
299
+%dir %_libdir/%name/plugins/audio_mixer
300
+%dir %_libdir/%name/plugins/audio_output
301
+%dir %_libdir/%name/plugins/codec
302
+%dir %_libdir/%name/plugins/control
303
+%dir %_libdir/%name/plugins/demux
304
+%dir %_libdir/%name/plugins/gui
305
+%dir %_libdir/%name/plugins/keystore
306
+%dir %_libdir/%name/plugins/logger
307
+%dir %_libdir/%name/plugins/lua
308
+%dir %_libdir/%name/plugins/meta_engine
309
+%dir %_libdir/%name/plugins/misc
310
+%dir %_libdir/%name/plugins/mux
311
+%dir %_libdir/%name/plugins/notify
312
+%dir %_libdir/%name/plugins/packetizer
313
+%dir %_libdir/%name/plugins/services_discovery
314
+%dir %_libdir/%name/plugins/spu
315
+%dir %_libdir/%name/plugins/stream_extractor
316
+%dir %_libdir/%name/plugins/stream_filter
317
+%dir %_libdir/%name/plugins/stream_out
318
+%dir %_libdir/%name/plugins/text_renderer
319
+%dir %_libdir/%name/plugins/vaapi
320
+%dir %_libdir/%name/plugins/vdpau
321
+%dir %_libdir/%name/plugins/video_chroma
322
+%dir %_libdir/%name/plugins/video_filter
323
+%dir %_libdir/%name/plugins/video_output
324
+%dir %_libdir/%name/plugins/video_splitter
325
+%dir %_libdir/%name/plugins/visualization
326
+%ghost %_libdir/%name/plugins/*.dat
327
+%_bindir/*
328
+%_datadir/%name/
329
+%_datadir/applications/*
330
+%_datadir/icons/*
331
+%_datadir/kde4
332
+%_datadir/metainfo/*
333
+%_datadir/pixmaps/*
334
+%_includedir/*
335
+%_libdir/%name/*.so
336
+%_libdir/%name/*.so.*
337
+%_libdir/%name/plugins/*/*.so
338
+%_libdir/%name/plugins/*/*/*.so
339
+%_libdir/*.so
340
+%_libdir/*.so.*
341
+%_libdir/pkgconfig/*.pc
342
+%_libexecdir/%name
343
+%_mandir/*/*
344
 
345
 %changelog
346
Refresh
Refresh
Request History
Olaf Hering's avatar

olh created request over 2 years ago


Olaf Hering's avatar

olh accepted request over 2 years ago