Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 257

vlc-beta.spec Changed

@@ -32,9 +32,9 @@
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://www.videolan.org
-Source0:        %{name}-%{version}.tar
-Source1:        %{name}.changes
-Source3:        %{name}-rpmlintrc
+Source0:        %name-%version.tar
+Source1:        %name.changes
+Source3:        %name-rpmlintrc
 Patch0:         vlc-beta.patch
 Patch1:         vlc.a52dec.patch
 Patch2:         vlc.hostname.patch
@@ -45,69 +45,69 @@
 %endif
 
 # avoid stale debug.rpm
-Conflicts:      %{name}-debuginfo < %{version}-%{release} 
-Conflicts:      %{name}-debugsource < %{version}-%{release} 
+Conflicts:      %name-debuginfo < %version-%release 
+Conflicts:      %name-debugsource < %version-%release 
 #
 Conflicts:      vlc
 Conflicts:      vlc-devel
 Conflicts:      vlc-qt
-Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
-Obsoletes:      vlc-codec-gstreamer-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-codecs < %{version}-%{release}
-Obsoletes:      vlc-codecs-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-debugsource < %{version}-%{release}
-Obsoletes:      vlc-devel < %{version}-%{release}
-Obsoletes:      vlc-jack < %{version}-%{release}
-Obsoletes:      vlc-jack-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-lang < %{version}-%{release}
-Obsoletes:      vlc-noX < %{version}-%{release}
-Obsoletes:      vlc-noX-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-opencv < %{version}-%{release}
-Obsoletes:      vlc-opencv-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-qt < %{version}-%{release}
-Obsoletes:      vlc-qt-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-vdpau < %{version}-%{release}
-Obsoletes:      vlc-vdpau-debuginfo < %{version}-%{release}
-Provides:       vlc-codec-gstreamer = %{version}-%{release}
-Provides:       vlc-codec-gstreamer-debuginfo = %{version}-%{release}
-Provides:       vlc-codecs = %{version}-%{release}
-Provides:       vlc-codecs-debuginfo = %{version}-%{release}
-Provides:       vlc-debuginfo = %{version}-%{release}
-Provides:       vlc-debugsource = %{version}-%{release}
-Provides:       vlc-devel = %{version}-%{release}
-Provides:       vlc-jack = %{version}-%{release}
-Provides:       vlc-jack-debuginfo = %{version}-%{release}
-Provides:       vlc-lang = %{version}-%{release}
-Provides:       vlc-noX = %{version}-%{release}
-Provides:       vlc-noX-debuginfo = %{version}-%{release}
-Provides:       vlc-opencv = %{version}-%{release}
-Provides:       vlc-opencv-debuginfo = %{version}-%{release}
-Provides:       vlc-qt = %{version}-%{release}
-Provides:       vlc-qt-debuginfo = %{version}-%{release}
-Provides:       vlc-vdpau = %{version}-%{release}
-Provides:       vlc-vdpau-debuginfo = %{version}-%{release}
+Obsoletes:      vlc-codec-gstreamer < %version-%release
+Obsoletes:      vlc-codec-gstreamer-debuginfo < %version-%release
+Obsoletes:      vlc-codecs < %version-%release
+Obsoletes:      vlc-codecs-debuginfo < %version-%release
+Obsoletes:      vlc-debuginfo < %version-%release
+Obsoletes:      vlc-debugsource < %version-%release
+Obsoletes:      vlc-devel < %version-%release
+Obsoletes:      vlc-jack < %version-%release
+Obsoletes:      vlc-jack-debuginfo < %version-%release
+Obsoletes:      vlc-lang < %version-%release
+Obsoletes:      vlc-noX < %version-%release
+Obsoletes:      vlc-noX-debuginfo < %version-%release
+Obsoletes:      vlc-opencv < %version-%release
+Obsoletes:      vlc-opencv-debuginfo < %version-%release
+Obsoletes:      vlc-qt < %version-%release
+Obsoletes:      vlc-qt-debuginfo < %version-%release
+Obsoletes:      vlc-vdpau < %version-%release
+Obsoletes:      vlc-vdpau-debuginfo < %version-%release
+Provides:       vlc-codec-gstreamer = %version-%release
+Provides:       vlc-codec-gstreamer-debuginfo = %version-%release
+Provides:       vlc-codecs = %version-%release
+Provides:       vlc-codecs-debuginfo = %version-%release
+Provides:       vlc-debuginfo = %version-%release
+Provides:       vlc-debugsource = %version-%release
+Provides:       vlc-devel = %version-%release
+Provides:       vlc-jack = %version-%release
+Provides:       vlc-jack-debuginfo = %version-%release
+Provides:       vlc-lang = %version-%release
+Provides:       vlc-noX = %version-%release
+Provides:       vlc-noX-debuginfo = %version-%release
+Provides:       vlc-opencv = %version-%release
+Provides:       vlc-opencv-debuginfo = %version-%release
+Provides:       vlc-qt = %version-%release
+Provides:       vlc-qt-debuginfo = %version-%release
+Provides:       vlc-vdpau = %version-%release
+Provides:       vlc-vdpau-debuginfo = %version-%release
 
-Obsoletes:      libvlc123 < %{version}-%{release}
-Obsoletes:      libvlc123-debuginfo < %{version}-%{release}
-Obsoletes:      libvlccore123 < %{version}-%{release}
-Obsoletes:      libvlccore123-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-beta-devel < %{version}-%{release}
-Obsoletes:      vlc-beta-noX < %{version}-%{release}
-Obsoletes:      vlc-beta-noX-debuginfo < %{version}-%{release}
-Obsoletes:      vlc-beta-noX-lang < %{version}-%{release}
-Obsoletes:      vlc-beta-qt < %{version}-%{release}
-Obsoletes:      vlc-beta-qt-debuginfo < %{version}-%{release}
-Provides:       libvlc123 = %{version}-%{release}
-Provides:       libvlc123-debuginfo = %{version}-%{release}
-Provides:       libvlccore123 = %{version}-%{release}
-Provides:       libvlccore123-debuginfo = %{version}-%{release}
-Provides:       vlc-beta-devel = %{version}-%{release}
-Provides:       vlc-beta-noX = %{version}-%{release}
-Provides:       vlc-beta-noX-debuginfo = %{version}-%{release}
-Provides:       vlc-beta-noX-lang = %{version}-%{release}
-Provides:       vlc-beta-qt = %{version}-%{release}
-Provides:       vlc-beta-qt-debuginfo = %{version}-%{release}
+Obsoletes:      libvlc123 < %version-%release
+Obsoletes:      libvlc123-debuginfo < %version-%release
+Obsoletes:      libvlccore123 < %version-%release
+Obsoletes:      libvlccore123-debuginfo < %version-%release
+Obsoletes:      vlc-beta-devel < %version-%release
+Obsoletes:      vlc-beta-noX < %version-%release
+Obsoletes:      vlc-beta-noX-debuginfo < %version-%release
+Obsoletes:      vlc-beta-noX-lang < %version-%release
+Obsoletes:      vlc-beta-qt < %version-%release
+Obsoletes:      vlc-beta-qt-debuginfo < %version-%release
+Provides:       libvlc123 = %version-%release
+Provides:       libvlc123-debuginfo = %version-%release
+Provides:       libvlccore123 = %version-%release
+Provides:       libvlccore123-debuginfo = %version-%release
+Provides:       vlc-beta-devel = %version-%release
+Provides:       vlc-beta-noX = %version-%release
+Provides:       vlc-beta-noX-debuginfo = %version-%release
+Provides:       vlc-beta-noX-lang = %version-%release
+Provides:       vlc-beta-qt = %version-%release
+Provides:       vlc-beta-qt-debuginfo = %version-%release
 
 BuildRequires:  bash
 BuildRequires:  gcc
@@ -275,10 +275,10 @@
 %build
 head -n 123 /proc/cpuinfo /proc/cmdline || :
 uname -a
-VERSION=%{version}
+VERSION=%version
 echo "${VERSION##*.}" > ./src/revision.txt
 sed -i~ "
-s@^AC_INIT.*@AC_INIT(%{name}, ${VERSION%%.*})@
+s@^AC_INIT.*@AC_INIT(%name, ${VERSION%%.*})@
 s@^VERSION_MAJOR=.@VERSION_MAJOR=${VERSION:0:2}@
 s@^VERSION_MINOR=.@VERSION_MINOR=${VERSION:2:2}@
 s@^VERSION_REVISION=.@VERSION_REVISION=${VERSION:4:2}@
@@ -307,8 +307,8 @@
 export BUILDCC="$(readlink -f ${BUILDCC})"
 export CC="$(readlink -f ${CC})"
 export CXX="$(readlink -f ${CXX})"
-CFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
-CXXFLAGS='%{optflags} -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
+CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
+CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
 ./bootstrap
 %configure --help
 %configure \
@@ -444,8 +444,8 @@
 	--enable-fribidi \
 	--enable-harfbuzz \
 	--enable-fontconfig \
-	--with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
-	--with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
+	--with-default-font=%_datadir/fonts/truetype/FreeSerifBold.ttf \
+	--with-default-monospace-font=%_datadir/fonts/truetype/FreeMono.ttf \
 	--enable-svg \
 	--enable-svgdec \
 	--disable-directx \
@@ -499,7 +499,7 @@
 %endif
 	--enable-vulkan \
 	--disable-medialibrary \
-	--with-kde-solid=%{_datadir}/kde4/apps/solid \
+	--with-kde-solid=%_datadir/kde4/apps/solid \
 	--enable-vlc \
 %if 0%{?suse_version} > 1500
 	--enable-nls \
@@ -510,85 +510,85 @@
 
 %install
 %make_install
-mkdir -p %{buildroot}/%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
-find %{buildroot} -type f -name "*.la" -delete -print
-find %{buildroot} -type f -name "*.a" -delete -print
-rm -rfv %{buildroot}%{_datadir}/macosx
-rm -rfv %{buildroot}%{_datadir}/doc
+mkdir -p %buildroot/%_datadir/pixmaps
+ln -s %_datadir/icons/hicolor/48x48/apps/vlc.png %buildroot/%_datadir/pixmaps/vlc.png
+find %buildroot -type f -name "*.la" -delete -print
+find %buildroot -type f -name "*.a" -delete -print
+rm -rfv %buildroot%_datadir/macosx