use upstream pc

This commit is contained in:
Tom Callaway 2016-03-02 11:29:44 -05:00
parent 983855ffce
commit d3e30294be
2 changed files with 4 additions and 25 deletions

View File

@ -1,14 +0,0 @@
prefix=@PREFIX@
exec_prefix=@PREFIX@
libdir=@LIBDIR@
includedir=@INCLUDEDIR@
Name: libsrtp
Description: Secure Real-time Transport Protocol library
Version: 1.4.4
URL: http://srtp.sourceforge.net
Requires:
Conflicts:
Libs: -L${libdir} -lsrtp
Libs.private:
Cflags: -I${includedir}/srtp/

View File

@ -2,14 +2,12 @@
Name: libsrtp
Version: 1.5.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: An implementation of the Secure Real-time Transport Protocol (SRTP)
Group: System Environment/Libraries
License: BSD
URL: https://github.com/cisco/libsrtp
Source0: https://github.com/cisco/libsrtp/archive/v%{version}.tar.gz
# Pkgconfig goodness
Source1: libsrtp.pc
# Universal config.h
Source2: config.h
# Fix shared lib so ldconfig doesn't complain
@ -55,14 +53,6 @@ make %{?_smp_mflags} shared_library
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Install the pkg-config file
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
install -m0644 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/
# Fill in the variables
sed -i "s|@PREFIX@|%{_prefix}|g" %{buildroot}%{_libdir}/pkgconfig/libsrtp.pc
sed -i "s|@LIBDIR@|%{_libdir}|g" %{buildroot}%{_libdir}/pkgconfig/libsrtp.pc
sed -i "s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/libsrtp.pc
# Handle multilib issues with config.h
mv %{buildroot}%{_includedir}/%{shortname}/config.h %{buildroot}%{_includedir}/%{shortname}/config-%{__isa_bits}.h
cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{shortname}/config.h
@ -81,6 +71,9 @@ cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{shortname}/config.h
%{_libdir}/*.so
%changelog
* Wed Mar 2 2016 Tom Callaway <spot@fedoraproject.org> - 1.5.4-3
- use upstream provided .pc file (bz1313590)
* Fri Feb 12 2016 Tom Callaway <spot@fedoraproject.org> - 1.5.4-2
- fix shared lib generation to silence ldconfig