Fix merge conflicts.
This commit is contained in:
commit
e3bb5b0bc9
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user