Accepting request 627678 from home:scarabeus_iv

- bsc#1103064 attempt to allow migration from the unprefixed devel
  packages cleanly

OBS-URL: https://build.opensuse.org/request/show/627678
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=15

ffmpeg-4.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 31 14:39:25 UTC 2018 - tchvatal@suse.com
+
+- bsc#1103064 attempt to allow migration from the unprefixed devel
+  packages cleanly
+
 -------------------------------------------------------------------
 Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com
 

ffmpeg-4.spec

@@ -270,7 +270,7 @@ This build of ffmpeg is limited in the number of codecs supported.
 Summary:        Development files for FFmpeg's codec library
 Group:          Development/Libraries/C and C++
 Provides:       libavcodec-devel = %version-%release
-Conflicts:      libavcodec-devel
+Obsoletes:      libavcodec-devel < %version-%release
 Requires:       %{name}-libavresample-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libavcodec58 = %version-%release
@@ -304,7 +304,7 @@ Group:          Development/Libraries/C and C++
 Provides:       ffmpeg-devel = %version-%release
 Conflicts:      ffmpeg-devel
 Provides:       libavdevice-devel = %version-%release
-Conflicts:      libavdevice-devel
+Obsoletes:      libavdevice-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavfilter-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
@@ -344,7 +344,7 @@ framework containing several filters, sources and sinks.
 Summary:        Development files for FFmpeg's audio/video filter library
 Group:          Development/Libraries/C and C++
 Provides:       libavfilter-devel = %version-%release
-Conflicts:      libavfilter-devel
+Obsoletes:      libavfilter-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
 Requires:       %{name}-libavresample-devel = %version-%release
@@ -382,7 +382,7 @@ This build of ffmpeg is limited in the number of codecs supported.
 Summary:        Development files for FFmpeg's stream format library
 Group:          Development/Libraries/C and C++
 Provides:       libavformat-devel = %version-%release
-Conflicts:      libavformat-devel
+Obsoletes:      libavformat-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       %{name}-libswresample-devel = %version-%release
@@ -413,7 +413,7 @@ It is advised to use libswresample for new code.
 Summary:        Development files for libavresample as present in FFmpeg
 Group:          Development/Libraries/C and C++
 Provides:       libavresample-devel = %version-%release
-Conflicts:      libavresample-devel
+Obsoletes:      libavresample-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libavresample4 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@@ -442,7 +442,7 @@ for pixel and sample formats).
 Summary:        Development files for FFmpeg's utility library
 Group:          Development/Libraries/C and C++
 Provides:       libavutil-devel = %version-%release
-Conflicts:      libavutil-devel
+Obsoletes:      libavutil-devel < %version-%release
 Requires:       libavutil56 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
 %devel_conflicts -c >= -v %{_major_expected}
@@ -470,7 +470,7 @@ correction, linear/cubic interpolating deinterlacing.
 Summary:        Development files for the FFmpeg post-processing library
 Group:          Development/Libraries/C and C++
 Provides:       libpostproc-devel = %version-%release
-Conflicts:      libpostproc-devel
+Obsoletes:      libpostproc-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libpostproc55 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@@ -496,7 +496,7 @@ sample rates, channel layout and channel formats.
 Summary:        Development files for the FFmpeg software resampling library
 Group:          Development/Libraries/C and C++
 Provides:       libswresample-devel = %version-%release
-Conflicts:      libswresample-devel
+Obsoletes:      libswresample-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libswresample3 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@@ -540,7 +540,7 @@ Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Provides:       ffmpeg-private-devel = %version
-Conflicts:      ffmpeg-private-devel
+Obsoletes:      ffmpeg-private-devel < %version
 %devel_conflicts -c < -v %{_major_version}
 %devel_conflicts -c >= -v %{_major_expected}