diff --git a/ffmpeg2.spec b/ffmpeg2.spec index fdf37d0..32969b6 100644 --- a/ffmpeg2.spec +++ b/ffmpeg2.spec @@ -9,7 +9,7 @@ Name: ffmpeg2 Epoch: 1 Version: 2.3.3 -Release: 2mamba +Release: 3mamba Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Group: System/Libraries Vendor: openmamba @@ -292,8 +292,9 @@ This is a virtual package that contains the dependencies necessary for installin export CFLAGS="%{optflags} -fno-unit-at-a-time -D__LINUX_USER__" ./configure \ --prefix="%{_prefix}" \ - --libdir="%{_libdir}" \ - --shlibdir="%{_libdir}" \ + --libdir="%{_libdir}/ffmpeg2" \ + --incdir="%{_includedir}/ffmpeg2" \ + --shlibdir="%{_libdir}/ffmpeg2" \ --mandir="%{_mandir}" \ --enable-libmp3lame \ --enable-libvorbis \ @@ -368,8 +369,14 @@ export CFLAGS="%{optflags} -fno-unit-at-a-time -D__LINUX_USER__" %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall \ - shlibdir="%{buildroot}%{_libdir}" \ - libdir="%{buildroot}%{_libdir}" + shlibdir="%{buildroot}%{_libdir}/ffmpeg2" \ + libdir="%{buildroot}%{_libdir}/ffmpeg2" + +install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo -e '%{_libdir}\n%{_libdir}/ffmpeg2/' > %{buildroot}%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf + +rm -f %{buildroot}%{_mandir}/man3/* + #\ # incdir="%{buildroot}%{_includedir}/ffmpeg" \ # shlibdir="%{buildroot}%{_libdir}" \ @@ -382,9 +389,9 @@ export CFLAGS="%{optflags} -fno-unit-at-a-time -D__LINUX_USER__" #install -m 644 libavcodec/libavcodec.a %{buildroot}%{_libdir} #install -m 644 libavformat/libavformat.a %{buildroot}%{_libdir} -# create compat symlink -install -d %{buildroot}%{_libdir}/libavcodec -ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a +## create compat symlink +#install -d %{buildroot}%{_libdir}/libavcodec +#ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a #install -d %{buildroot}%{_includedir}/ffmpeg #cp -a %{buildroot}%{_includedir}/libavcodec/*.h \ @@ -409,32 +416,77 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -n libavcodec-%{name} -p /sbin/ldconfig -%postun -n libavcodec-%{name} -p /sbin/ldconfig +%post -n libavcodec-%{name} +/sbin/ldconfig +: -%post -n libavdevice-%{name} -p /sbin/ldconfig -%postun -n libavdevice-%{name} -p /sbin/ldconfig +%postun -n libavcodec-%{name} +/sbin/ldconfig +: -%post -n libavfilter-%{name} -p /sbin/ldconfig -%postun -n libavfilter-%{name} -p /sbin/ldconfig +%post -n libavdevice-%{name} +/sbin/ldconfig +: -%post -n libavformat-%{name} -p /sbin/ldconfig -%postun -n libavformat-%{name} -p /sbin/ldconfig +%postun -n libavdevice-%{name} +/sbin/ldconfig +: -%post -n libavresample-%{name} -p /sbin/ldconfig -%postun -n libavresample-%{name} -p /sbin/ldconfig +%post -n libavfilter-%{name} +/sbin/ldconfig +: -%post -n libavutil-%{name} -p /sbin/ldconfig -%postun -n libavutil-%{name} -p /sbin/ldconfig +%postun -n libavfilter-%{name} +/sbin/ldconfig +: -%post -n libpostproc-%{name} -p /sbin/ldconfig -%postun -n libpostproc-%{name} -p /sbin/ldconfig +%post -n libavformat-%{name} +/sbin/ldconfig +: -%post -n libswscale-%{name} -p /sbin/ldconfig -%postun -n libswscale-%{name} -p /sbin/ldconfig +%postun -n libavformat-%{name} +/sbin/ldconfig +: -%post -n libswresample-%{name} -p /sbin/ldconfig -%postun -n libswresample-%{name} -p /sbin/ldconfig +%post -n libavresample-%{name} +/sbin/ldconfig +: + +%postun -n libavresample-%{name} +/sbin/ldconfig +: + +%post -n libavutil-%{name} +/sbin/ldconfig +: + +%postun -n libavutil-%{name} +/sbin/ldconfig +: + +%post -n libpostproc-%{name} +/sbin/ldconfig +: + +%postun -n libpostproc-%{name} +/sbin/ldconfig +: + +%post -n libswscale-%{name} +/sbin/ldconfig +: + +%postun -n libswscale-%{name} +/sbin/ldconfig +: + +%post -n libswresample-%{name} +/sbin/ldconfig +: + +%postun -n libswresample-%{name} +/sbin/ldconfig +: %files %defattr(-,root,root) @@ -476,124 +528,131 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %files -n libavcodec-%{name} %defattr(-,root,root) -%{_libdir}/libavcodec.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavcodec.so.* %files -n libavcodec-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavcodec -%{_includedir}/libavcodec/* -%dir %{_libdir}/libavcodec -%{_libdir}/libavcodec/libavcodec.a -%{_libdir}/libavcodec.a -%{_libdir}/libavcodec.so -%{_libdir}/pkgconfig/libavcodec.pc -%{_mandir}/man3/libavcodec.3.gz +%dir %{_includedir}/ffmpeg2/libavcodec +%{_includedir}/ffmpeg2/libavcodec/* +%{_libdir}/ffmpeg2/libavcodec.a +%{_libdir}/ffmpeg2/libavcodec.so +%{_libdir}/ffmpeg2/pkgconfig/libavcodec.pc +#%{_mandir}/man3/libavcodec.3.gz %files -n libavdevice-%{name} %defattr(-,root,root) -%{_libdir}/libavdevice.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavdevice.so.* %files -n libavdevice-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavdevice -%{_includedir}/libavdevice/avdevice.h -%{_includedir}/libavdevice/version.h -%{_libdir}/libavdevice.a -%{_libdir}/libavdevice.so -%{_libdir}/pkgconfig/libavdevice.pc -%{_mandir}/man3/libavdevice.3.gz +%dir %{_includedir}/ffmpeg2/libavdevice +%{_includedir}/ffmpeg2/libavdevice/avdevice.h +%{_includedir}/ffmpeg2/libavdevice/version.h +%{_libdir}/ffmpeg2/libavdevice.a +%{_libdir}/ffmpeg2/libavdevice.so +%{_libdir}/ffmpeg2/pkgconfig/libavdevice.pc +#%{_mandir}/man3/libavdevice.3.gz %files -n libavfilter-%{name} %defattr(-,root,root) -%{_libdir}/libavfilter.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavfilter.so.* %files -n libavfilter-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavfilter -%{_includedir}/libavfilter/*.h -%{_libdir}/libavfilter.a -%{_libdir}/libavfilter.so -%{_libdir}/pkgconfig/libavfilter.pc -%{_mandir}/man3/libavfilter.3.gz +%dir %{_includedir}/ffmpeg2/libavfilter +%{_includedir}/ffmpeg2/libavfilter/*.h +%{_libdir}/ffmpeg2/libavfilter.a +%{_libdir}/ffmpeg2/libavfilter.so +%{_libdir}/ffmpeg2/pkgconfig/libavfilter.pc +#%{_mandir}/man3/libavfilter.3.gz %files -n libavformat-%{name} %defattr(-,root,root) -%{_libdir}/libavformat.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavformat.so.* %files -n libavformat-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavformat -%{_includedir}/libavformat/*.h -%{_libdir}/libavformat.a -%{_libdir}/libavformat.so -%{_libdir}/pkgconfig/libavformat.pc -%{_mandir}/man3/libavformat.3.gz +%dir %{_includedir}/ffmpeg2/libavformat +%{_includedir}/ffmpeg2/libavformat/*.h +%{_libdir}/ffmpeg2/libavformat.a +%{_libdir}/ffmpeg2/libavformat.so +%{_libdir}/ffmpeg2/pkgconfig/libavformat.pc +#%{_mandir}/man3/libavformat.3.gz %files -n libavresample-%{name} %defattr(-,root,root) -%{_libdir}/libavresample.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavresample.so.* %files -n libavresample-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavresample -%{_includedir}/libavresample/avresample.h -%{_includedir}/libavresample/version.h -%{_libdir}/libavresample.a -%{_libdir}/libavresample.so -%{_libdir}/pkgconfig/libavresample.pc +%dir %{_includedir}/ffmpeg2/libavresample +%{_includedir}/ffmpeg2/libavresample/avresample.h +%{_includedir}/ffmpeg2/libavresample/version.h +%{_libdir}/ffmpeg2/libavresample.a +%{_libdir}/ffmpeg2/libavresample.so +%{_libdir}/ffmpeg2/pkgconfig/libavresample.pc %files -n libavutil-%{name} %defattr(-,root,root) -%{_libdir}/libavutil.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libavutil.so.* %files -n libavutil-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libavutil -%{_includedir}/libavutil/*.h -%{_libdir}/libavutil.a -%{_libdir}/libavutil.so -%{_libdir}/pkgconfig/libavutil.pc -%{_mandir}/man3/libavutil.3.gz +%dir %{_includedir}/ffmpeg2/libavutil +%{_includedir}/ffmpeg2/libavutil/*.h +%{_libdir}/ffmpeg2/libavutil.a +%{_libdir}/ffmpeg2/libavutil.so +%{_libdir}/ffmpeg2/pkgconfig/libavutil.pc +#%{_mandir}/man3/libavutil.3.gz %files -n libpostproc-%{name} %defattr(-,root,root) -%{_libdir}/libpostproc.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libpostproc.so.* %files -n libpostproc-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libpostproc -%{_includedir}/libpostproc/postprocess.h -%{_includedir}/libpostproc/version.h -%{_libdir}/libpostproc.a -%{_libdir}/libpostproc.so -%{_libdir}/pkgconfig/libpostproc.pc +%dir %{_includedir}/ffmpeg2/libpostproc +%{_includedir}/ffmpeg2/libpostproc/postprocess.h +%{_includedir}/ffmpeg2/libpostproc/version.h +%{_libdir}/ffmpeg2/libpostproc.a +%{_libdir}/ffmpeg2/libpostproc.so +%{_libdir}/ffmpeg2/pkgconfig/libpostproc.pc %{_datadir}/ffmpeg/examples/README %files -n libswscale-%{name} %defattr(-,root,root) -%{_libdir}/libswscale.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libswscale.so.* %files -n libswscale-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libswscale -%{_includedir}/libswscale/*.h -%{_libdir}/libswscale.a -%{_libdir}/libswscale.so -%{_libdir}/pkgconfig/libswscale.pc -%{_mandir}/man3/libswscale.3* +%dir %{_includedir}/ffmpeg2/libswscale +%{_includedir}/ffmpeg2/libswscale/*.h +%{_libdir}/ffmpeg2/libswscale.a +%{_libdir}/ffmpeg2/libswscale.so +%{_libdir}/ffmpeg2/pkgconfig/libswscale.pc +#%{_mandir}/man3/libswscale.3* %files -n libswresample-%{name} %defattr(-,root,root) -%{_libdir}/libswresample.so.* +%{_sysconfdir}/ld.so.conf.d/ffmpeg2-%{_arch}.conf +%{_libdir}/ffmpeg2/libswresample.so.* %files -n libswresample-%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/libswresample -%{_includedir}/libswresample/*.h -%{_libdir}/libswresample.a -%{_libdir}/libswresample.so -%{_libdir}/pkgconfig/libswresample.pc -%{_mandir}/man3/libswresample.3* +%dir %{_includedir}/ffmpeg2/libswresample +%{_includedir}/ffmpeg2/libswresample/*.h +%{_libdir}/ffmpeg2/libswresample.a +%{_libdir}/ffmpeg2/libswresample.so +%{_libdir}/ffmpeg2/pkgconfig/libswresample.pc +#%{_mandir}/man3/libswresample.3* %files devel %defattr(-,root,root) @@ -601,6 +660,9 @@ ln -s ../libavcodec.a %{buildroot}%{_libdir}/libavcodec/libavcodec.a %{_docdir}/ffmpeg/* %changelog +* Fri Mar 25 2016 Silvan Calarco 2.3.3-3mamba +- allow cohexistence of devel packages with ffmpeg 3.0 + * Sat Mar 12 2016 Silvan Calarco 2.3.3-2mamba - legacy package