Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	nprobe.spec
@@ -10,6 +10,8 @@ Source1: GeoLiteCity.dat.gz Source2: GeoIPASNum.dat.gz Source3: UsersGuide.pdf +Patch0: nprobe-plugindir.patch +Patch1: nprobe-GeoIPdat-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %if 0%{?rhel_version} \|\| 0%{?centos_version} \|\| 0%{?fedora_version} @@ -41,6 +43,8 @@ %prep %setup -n %{name}_%{version}_%{reldate}_pro +%patch0 +%patch1 cp %{S:1} . cp %{S:2} . cp %{S:3} . @@ -60,6 +64,8 @@ %install %__make DESTDIR=%{buildroot} install +cp GeoLiteCity.dat %{buildroot}%{_prefix}/lib/nprobe/ +cp GeoIPASNum.dat %{buildroot}%{_prefix}/lib/nprobe/ %clean rm -rf %{buildroot} @@ -70,6 +76,8 @@ %{_bindir}/nprobe %dir %{_prefix}/lib/nprobe %dir %{_prefix}/lib/nprobe/plugins +%{_prefix}/lib/nprobe/GeoIPASNum.dat +%{_prefix}/lib/nprobe/GeoLiteCity.dat %{_prefix}/lib/nprobe/plugins/libbgpPlugin-%{version}.so %{_prefix}/lib/nprobe/plugins/libbgpPlugin.la %{_prefix}/lib/nprobe/plugins/libbgpPlugin.so
[-] [+]	Added	nprobe-GeoIPdat-dir.patch ^
@@ -0,0 +1,20 @@ +--- nprobe.c.orig 2010-06-10 17:06:40.868574372 +0200 ++++ nprobe.c 2010-06-10 17:07:06.964585222 +0200 +@@ -3203,7 +3203,7 @@ + + #ifdef HAVE_GEOIP + if(readOnlyGlobals.geo_ip_asn_db == NULL) +- readASs("GeoIPASNum.dat"); ++ readASs("/usr/lib/nprobe/GeoIPASNum.dat"); + + if((strstr(readOnlyGlobals.stringTemplate, "_COUNTRY") == NULL) + && (strstr(readOnlyGlobals.stringTemplate, "_CITY") == NULL)) { +@@ -3213,7 +3213,7 @@ + } + } else { + if(readOnlyGlobals.geo_ip_city_db == NULL) +- readCities("GeoLiteCity.dat"); ++ readCities("/usr/lib/nprobe/GeoLiteCity.dat"); + } + #endif +
[-] [+]	Added	nprobe-plugindir.patch ^
@@ -0,0 +1,10 @@ +--- plugin.c.orig 2010-06-10 17:03:12.689369877 +0200 ++++ plugin.c 2010-06-10 17:03:57.541179169 +0200 +@@ -46,6 +46,7 @@ + #else + static char *pluginDirs[] = { "./plugins", + "/usr/local/lib/nprobe/plugins", ++ "/usr/lib/nprobe/plugins", + NULL }; + #endif +