pcap-config: remove unused variable to prevent multilib conflicts

This commit is contained in:
Michal Sekletar 2013-03-26 10:01:28 +01:00
parent 8490e94d3b
commit 99e93bfed0
2 changed files with 19 additions and 7 deletions

View File

@ -1,7 +1,15 @@
diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
--- libpcap/pcap-config.in.multilib 2011-11-23 14:28:54.580396515 +0100
+++ libpcap/pcap-config.in 2011-11-23 14:36:47.408268484 +0100
@@ -36,16 +36,6 @@ do
diff -up libpcap-1.3.0/pcap-config.in.multilib libpcap-1.3.0/pcap-config.in
--- libpcap-1.3.0/pcap-config.in.multilib 2012-03-29 14:57:32.000000000 +0200
+++ libpcap-1.3.0/pcap-config.in 2013-03-26 09:56:16.293324264 +0100
@@ -7,7 +7,6 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
includedir="@includedir@"
-libdir="@libdir@"
V_RPATH_OPT="@V_RPATH_OPT@"
LIBS="@LIBS@"
@@ -36,16 +35,6 @@ do
esac
shift
done
@ -18,7 +26,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
if [ "$static" = 1 ]
then
#
@@ -54,16 +44,16 @@ then
@@ -54,16 +43,16 @@ then
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
@ -39,7 +47,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
elif [ "$show_additional_libs" = 1 ]
then
echo "$LIBS"
@@ -75,15 +65,15 @@ else
@@ -75,15 +64,15 @@ else
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then

View File

@ -1,7 +1,7 @@
Name: libpcap
Epoch: 14
Version: 1.3.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A system-independent interface for user-level packet capture
Group: Development/Libraries
License: BSD with advertising
@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
%{_mandir}/man5/pcap*.5*
%changelog
* Tue Mar 26 2013 Michal Sekletar <msekleta@redhat.com> - 14:1.3.0-4
- remove unused variable from pcap-config to prevent multilib conflicts
- specfile cleanup
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14:1.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild