Fix merge conflicts.

This commit is contained in:
Brian Pepple 2013-03-23 22:25:06 -04:00
commit e3bb5b0bc9
3 changed files with 8 additions and 3 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/gst-plugins-bad-free-1.0.3.tar.xz
/gst-plugins-bad-free-1.0.4.tar.xz
/gst-plugins-bad-free-1.0.5.tar.xz
/gst-plugins-bad-free-1.0.6.tar.xz

View File

@ -8,8 +8,8 @@
%endif
Name: gstreamer1-plugins-bad-free
Version: 1.0.5
Release: 2%{?dist}
Version: 1.0.6
Release: 1%{?dist}
Summary: GStreamer streaming media framework "bad" plugins
License: LGPLv2+ and LGPLv2
@ -211,6 +211,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
# Plugins with external dependencies
%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
%{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so
%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
%{_libdir}/gstreamer-%{majorminor}/libgstopus.so
%{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
@ -252,6 +253,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
%{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
%changelog
* Sun Mar 24 2013 Brian Pepple <bpepple@fedoraproject.org> - 1.0.6-1
- Update to 1.0.6.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1 +1 @@
43c600d406cab67a767d562d1e145869 gst-plugins-bad-free-1.0.5.tar.xz
d5bda897584e54dde3f55ad1a6816c2d gst-plugins-bad-free-1.0.6.tar.xz