From 670ee78b0f05fdb6ecd99631430c33135d9f59bd Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 13:30:56 +0000
Subject: auto-import changelog data from traceroute-1.4a12-22.src.rpm

Wed May 12 2004 Phil Knirsch <pknirsch@redhat.com> 1.4a12-22
- Enabled PIE for traceroute.

---

diff --git a/traceroute.spec b/traceroute.spec
index fbd81db..adac02b 100644
--- a/traceroute.spec
+++ b/traceroute.spec
@@ -1,7 +1,7 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.4a12
-Release: 21.1
+Release: 22
 License: BSD
 Group: Applications/Internet
 Source: traceroute-1.4a12.tar.bz2
@@ -22,6 +22,7 @@ Patch13: traceroute-1.4a12-sockopt.patch
 Patch14: traceroute-1.4a12-sockopt2.patch
 Patch15: traceroute-1.4a12-tos-monitoring.patch
 Patch16: traceroute-1.4a12-mpls-icmp-02.patch
+Patch17: traceroute-1.4a12-pie.patch
 URL: ftp://ftp.ee.lbl.gov/
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
@@ -56,13 +57,19 @@ problems.
 %patch14 -p1 -b .sockopt2
 %patch15 -p1 -b .tos-monitoring
 %patch16 -p1 -b .mpls-icmp-02
+%patch17 -p1 -b .pie
 
 %build
-
 rm -f config.sub
 cp /usr/share/libtool/config.sub .
+%ifarch s390 s390x
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+%else
+export CFLAGS="$RPM_OPT_FLAGS -fpic"
+%endif
+export LDFLAGS="-pie"
 %configure
-make CCOPT="$RPM_OPT_FLAGS"
+make CCOPT="$CFLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Wed May 12 2004 Phil Knirsch <pknirsch@redhat.com> 1.4a12-22
+- Enabled PIE for traceroute.
+
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt