Changes of Revision 257

View file
vlc-beta.spec Changed
​x
 
1
@@ -32,9 +32,9 @@
2
 License:        GPL-2.0+ and LGPL-2.1+
3
 Group:          Productivity/Multimedia/Video/Players
4
 Url:            http://www.videolan.org
5
-Source0:        %{name}-%{version}.tar
6
-Source1:        %{name}.changes
7
-Source3:        %{name}-rpmlintrc
8
+Source0:        %name-%version.tar
9
+Source1:        %name.changes
10
+Source3:        %name-rpmlintrc
11
 Patch0:         vlc-beta.patch
12
 Patch1:         vlc.a52dec.patch
13
 Patch2:         vlc.hostname.patch
14
@@ -45,69 +45,69 @@
15
 %endif
16
17
 # avoid stale debug.rpm
18
-Conflicts:      %{name}-debuginfo < %{version}-%{release}
19
-Conflicts:      %{name}-debugsource < %{version}-%{release}
20
+Conflicts:      %name-debuginfo < %version-%release
21
+Conflicts:      %name-debugsource < %version-%release
22
 #
23
 Conflicts:      vlc
24
 Conflicts:      vlc-devel
25
 Conflicts:      vlc-qt
26
-Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
27
-Obsoletes:      vlc-codec-gstreamer-debuginfo < %{version}-%{release}
28
-Obsoletes:      vlc-codecs < %{version}-%{release}
29
-Obsoletes:      vlc-codecs-debuginfo < %{version}-%{release}
30
-Obsoletes:      vlc-debuginfo < %{version}-%{release}
31
-Obsoletes:      vlc-debugsource < %{version}-%{release}
32
-Obsoletes:      vlc-devel < %{version}-%{release}
33
-Obsoletes:      vlc-jack < %{version}-%{release}
34
-Obsoletes:      vlc-jack-debuginfo < %{version}-%{release}
35
-Obsoletes:      vlc-lang < %{version}-%{release}
36
-Obsoletes:      vlc-noX < %{version}-%{release}
37
-Obsoletes:      vlc-noX-debuginfo < %{version}-%{release}
38
-Obsoletes:      vlc-opencv < %{version}-%{release}
39
-Obsoletes:      vlc-opencv-debuginfo < %{version}-%{release}
40
-Obsoletes:      vlc-qt < %{version}-%{release}
41
-Obsoletes:      vlc-qt-debuginfo < %{version}-%{release}
42
-Obsoletes:      vlc-vdpau < %{version}-%{release}
43
-Obsoletes:      vlc-vdpau-debuginfo < %{version}-%{release}
44
-Provides:       vlc-codec-gstreamer = %{version}-%{release}
45
-Provides:       vlc-codec-gstreamer-debuginfo = %{version}-%{release}
46
-Provides:       vlc-codecs = %{version}-%{release}
47
-Provides:       vlc-codecs-debuginfo = %{version}-%{release}
48
-Provides:       vlc-debuginfo = %{version}-%{release}
49
-Provides:       vlc-debugsource = %{version}-%{release}
50
-Provides:       vlc-devel = %{version}-%{release}
51
-Provides:       vlc-jack = %{version}-%{release}
52
-Provides:       vlc-jack-debuginfo = %{version}-%{release}
53
-Provides:       vlc-lang = %{version}-%{release}
54
-Provides:       vlc-noX = %{version}-%{release}
55
-Provides:       vlc-noX-debuginfo = %{version}-%{release}
56
-Provides:       vlc-opencv = %{version}-%{release}
57
-Provides:       vlc-opencv-debuginfo = %{version}-%{release}
58
-Provides:       vlc-qt = %{version}-%{release}
59
-Provides:       vlc-qt-debuginfo = %{version}-%{release}
60
-Provides:       vlc-vdpau = %{version}-%{release}
61
-Provides:       vlc-vdpau-debuginfo = %{version}-%{release}
62
+Obsoletes:      vlc-codec-gstreamer < %version-%release
63
+Obsoletes:      vlc-codec-gstreamer-debuginfo < %version-%release
64
+Obsoletes:      vlc-codecs < %version-%release
65
+Obsoletes:      vlc-codecs-debuginfo < %version-%release
66
+Obsoletes:      vlc-debuginfo < %version-%release
67
+Obsoletes:      vlc-debugsource < %version-%release
68
+Obsoletes:      vlc-devel < %version-%release
69
+Obsoletes:      vlc-jack < %version-%release
70
+Obsoletes:      vlc-jack-debuginfo < %version-%release
71
+Obsoletes:      vlc-lang < %version-%release
72
+Obsoletes:      vlc-noX < %version-%release
73
+Obsoletes:      vlc-noX-debuginfo < %version-%release
74
+Obsoletes:      vlc-opencv < %version-%release
75
+Obsoletes:      vlc-opencv-debuginfo < %version-%release
76
+Obsoletes:      vlc-qt < %version-%release
77
+Obsoletes:      vlc-qt-debuginfo < %version-%release
78
+Obsoletes:      vlc-vdpau < %version-%release
79
+Obsoletes:      vlc-vdpau-debuginfo < %version-%release
80
+Provides:       vlc-codec-gstreamer = %version-%release
81
+Provides:       vlc-codec-gstreamer-debuginfo = %version-%release
82
+Provides:       vlc-codecs = %version-%release
83
+Provides:       vlc-codecs-debuginfo = %version-%release
84
+Provides:       vlc-debuginfo = %version-%release
85
+Provides:       vlc-debugsource = %version-%release
86
+Provides:       vlc-devel = %version-%release
87
+Provides:       vlc-jack = %version-%release
88
+Provides:       vlc-jack-debuginfo = %version-%release
89
+Provides:       vlc-lang = %version-%release
90
+Provides:       vlc-noX = %version-%release
91
+Provides:       vlc-noX-debuginfo = %version-%release
92
+Provides:       vlc-opencv = %version-%release
93
+Provides:       vlc-opencv-debuginfo = %version-%release
94
+Provides:       vlc-qt = %version-%release
95
+Provides:       vlc-qt-debuginfo = %version-%release
96
+Provides:       vlc-vdpau = %version-%release
97
+Provides:       vlc-vdpau-debuginfo = %version-%release
98
99
-Obsoletes:      libvlc123 < %{version}-%{release}
100
-Obsoletes:      libvlc123-debuginfo < %{version}-%{release}
101
-Obsoletes:      libvlccore123 < %{version}-%{release}
102
-Obsoletes:      libvlccore123-debuginfo < %{version}-%{release}
103
-Obsoletes:      vlc-beta-devel < %{version}-%{release}
104
-Obsoletes:      vlc-beta-noX < %{version}-%{release}
105
-Obsoletes:      vlc-beta-noX-debuginfo < %{version}-%{release}
106
-Obsoletes:      vlc-beta-noX-lang < %{version}-%{release}
107
-Obsoletes:      vlc-beta-qt < %{version}-%{release}
108
-Obsoletes:      vlc-beta-qt-debuginfo < %{version}-%{release}
109
-Provides:       libvlc123 = %{version}-%{release}
110
-Provides:       libvlc123-debuginfo = %{version}-%{release}
111
-Provides:       libvlccore123 = %{version}-%{release}
112
-Provides:       libvlccore123-debuginfo = %{version}-%{release}
113
-Provides:       vlc-beta-devel = %{version}-%{release}
114
-Provides:       vlc-beta-noX = %{version}-%{release}
115
-Provides:       vlc-beta-noX-debuginfo = %{version}-%{release}
116
-Provides:       vlc-beta-noX-lang = %{version}-%{release}
117
-Provides:       vlc-beta-qt = %{version}-%{release}
118
-Provides:       vlc-beta-qt-debuginfo = %{version}-%{release}
119
+Obsoletes:      libvlc123 < %version-%release
120
+Obsoletes:      libvlc123-debuginfo < %version-%release
121
+Obsoletes:      libvlccore123 < %version-%release
122
+Obsoletes:      libvlccore123-debuginfo < %version-%release
123
+Obsoletes:      vlc-beta-devel < %version-%release
124
+Obsoletes:      vlc-beta-noX < %version-%release
125
+Obsoletes:      vlc-beta-noX-debuginfo < %version-%release
126
+Obsoletes:      vlc-beta-noX-lang < %version-%release
127
+Obsoletes:      vlc-beta-qt < %version-%release
128
+Obsoletes:      vlc-beta-qt-debuginfo < %version-%release
129
+Provides:       libvlc123 = %version-%release
130
+Provides:       libvlc123-debuginfo = %version-%release
131
+Provides:       libvlccore123 = %version-%release
132
+Provides:       libvlccore123-debuginfo = %version-%release
133
+Provides:       vlc-beta-devel = %version-%release
134
+Provides:       vlc-beta-noX = %version-%release
135
+Provides:       vlc-beta-noX-debuginfo = %version-%release
136
+Provides:       vlc-beta-noX-lang = %version-%release
137
+Provides:       vlc-beta-qt = %version-%release
138
+Provides:       vlc-beta-qt-debuginfo = %version-%release
139
140
 BuildRequires:  bash
141
 BuildRequires:  gcc
142
@@ -275,10 +275,10 @@
143
 %build
144
 head -n 123 /proc/cpuinfo /proc/cmdline || :
145
 uname -a
146
-VERSION=%{version}
147
+VERSION=%version
148
 echo "${VERSION##*.}" > ./src/revision.txt
149
 sed -i~ "
150
-s@^AC_INIT.*@AC_INIT(%{name}, ${VERSION%%.*})@
151
+s@^AC_INIT.*@AC_INIT(%name, ${VERSION%%.*})@
152
 s@^VERSION_MAJOR=.@VERSION_MAJOR=${VERSION:0:2}@
153
 s@^VERSION_MINOR=.@VERSION_MINOR=${VERSION:2:2}@
154
 s@^VERSION_REVISION=.@VERSION_REVISION=${VERSION:4:2}@
155
@@ -307,8 +307,8 @@
156
 export BUILDCC="$(readlink -f ${BUILDCC})"
157
 export CC="$(readlink -f ${CC})"
158
 export CXX="$(readlink -f ${CXX})"
159
-CFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
160
-CXXFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
161
+CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
162
+CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
163
 ./bootstrap
164
 %configure --help
165
 %configure \
166
@@ -444,8 +444,8 @@
167
    --enable-fribidi \
168
    --enable-harfbuzz \
169
    --enable-fontconfig \
170
-   --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
171
-   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
172
+   --with-default-font=%_datadir/fonts/truetype/FreeSerifBold.ttf \
173
+   --with-default-monospace-font=%_datadir/fonts/truetype/FreeMono.ttf \
174
    --enable-svg \
175
    --enable-svgdec \
176
    --disable-directx \
177
@@ -499,7 +499,7 @@
178
 %endif
179
    --enable-vulkan \
180
    --disable-medialibrary \
181
-   --with-kde-solid=%{_datadir}/kde4/apps/solid \
182
+   --with-kde-solid=%_datadir/kde4/apps/solid \
183
    --enable-vlc \
184
 %if 0%{?suse_version} > 1500
185
    --enable-nls \
186
@@ -510,85 +510,85 @@
187
188
 %install
189
 %make_install
190
-mkdir -p %{buildroot}/%{_datadir}/pixmaps
191
-ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
192
-find %{buildroot} -type f -name "*.la" -delete -print
193
-find %{buildroot} -type f -name "*.a" -delete -print
194
-rm -rfv %{buildroot}%{_datadir}/macosx
195
-rm -rfv %{buildroot}%{_datadir}/doc
196
+mkdir -p %buildroot/%_datadir/pixmaps
197
+ln -s %_datadir/icons/hicolor/48x48/apps/vlc.png %buildroot/%_datadir/pixmaps/vlc.png
198
+find %buildroot -type f -name "*.la" -delete -print
199
+find %buildroot -type f -name "*.a" -delete -print
200
+rm -rfv %buildroot%_datadir/macosx
201
​
Locations
Help
Contact