From 1e9aeb0787ca88d1b2b5bfec66927d6adfd5329a Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Mar 01 2018 16:33:20 +0000 Subject: Cleanup spec file, remove unused patch --- diff --git a/dnsperf-usage.patch b/dnsperf-usage.patch deleted file mode 100644 index c479cf2..0000000 --- a/dnsperf-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur dnsperf-src-2.0.0.0-1-orig/dnsperf.c dnsperf-src-2.0.0.0-1/dnsperf.c ---- dnsperf-src-2.0.0.0-1-orig/dnsperf.c 2012-03-01 21:25:22.000000000 -0500 -+++ dnsperf-src-2.0.0.0-1/dnsperf.c 2012-04-18 14:44:44.423569585 -0400 -@@ -992,7 +992,9 @@ - isc_result_t result; - - printf("DNS Performance Testing Tool\n" -- "Nominum Version " VERSION "\n\n"); -+ "Nominum Version " VERSION "\n" -+ "(example query data file: /usr/share/dnsperf/queryfile-example-current)\n\n"); -+ - - setup(argc, argv, &config); - -diff -Naur dnsperf-src-2.0.0.0-1-orig/resperf.c dnsperf-src-2.0.0.0-1/resperf.c ---- dnsperf-src-2.0.0.0-1-orig/resperf.c 2012-03-01 21:25:22.000000000 -0500 -+++ dnsperf-src-2.0.0.0-1/resperf.c 2012-04-18 14:44:06.117378260 -0400 -@@ -559,7 +559,8 @@ - unsigned int max_packet_size; - - printf("DNS Resolution Performance Testing Tool\n" -- "Nominum Version " VERSION "\n\n"); -+ "Nominum Version " VERSION "\n" -+ "(example query data file: /usr/share/dnsperf/queryfile-example-current)\n\n"); - - setup(argc, argv); - diff --git a/dnsperf.spec b/dnsperf.spec index d90da4f..86e40f0 100644 --- a/dnsperf.spec +++ b/dnsperf.spec @@ -8,7 +8,6 @@ Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{versi Source2: bind9-hmacsha.h Source3: queryfile-example-current.gz Patch1: dnsperf-buffer-inline.patch -Group: Applications/Internet BuildRequires: bind-devel >= 9.3.0, libcap-devel, gzip, openssl-devel BuildRequires: krb5-devel, libxml2-devel, GeoIP-devel Requires: gnuplot pcapy python2-dns @@ -20,16 +19,16 @@ For more information, see the dnsperf(1) and resperf(1) man pages. %prep %setup -q -n dnsperf-src-%{version}-1 cp %{SOURCE2} hmacsha.h -%patch -p1 -b .buffer -%configure +%patch1 -p1 -b .buffer + sed -i "s//\"hmacsha.h\"/" dns.c %build -%{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/include/bind9 -I." %{?_smp_mflags} +%configure +%make_build CFLAGS="$RPM_OPT_FLAGS -I/usr/include/bind9 -I." %install -rm -rf %{buildroot} -%{__make} DESTDIR=%{buildroot} install +%make_install install contrib/queryparse/queryparse %{buildroot}/%{_bindir} install -D -m 644 contrib/queryparse/queryparse.1 %{buildroot}/%{_mandir}/man1/queryparse.1 gzip %{buildroot}/%{_mandir}/man1/queryparse.1 @@ -49,6 +48,7 @@ chmod 644 %{buildroot}%{_datadir}/%{name}/queryfile-example-current %changelog * Thu Mar 01 2018 Petr Menšík - 2.1.0.0-14 - Define value to USEINLINE macro, rebuild for bind 9.11.3 +- Cleanup spec file * Thu Mar 01 2018 Iryna Shcherbina - 2.1.0.0-13 - Update Python 2 dependency declarations to new packaging standards