rpms/rkhunter/FC-4 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE

Gregory Lynn Houlette (tamaster) fedora-extras-commits at redhat.com
Fri Mar 17 12:58:54 UTC 2006


Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8924

Modified Files:
	rkhunter.spec 
Added Files:
	rkhunter-1.2.8-2.src.sha 
Removed Files:
	rkhunter-1.2.8-1.src.sha 
Log Message:
* Fri Mar 17 2006 Greg Houlette <tamaster at pobox.com> - 1.2.8-2
- Fixed architectural dependency during package creation eliminating
  use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting)



--- NEW FILE rkhunter-1.2.8-2.src.sha ---
1a882ef4351214facffcad1d5c0e7acf1a9d875b  ../SOURCES/rkhunter-1.2.8.tar.gz
7e050d1a82a060b77943d3f7ccd82982d41f1ec3  ../SOURCES/rkhunter-auto_scan.tar.gz
7f60ea47f064ab28ae40b7ffc8a62a68a7b14735  ../SOURCES/rkhunter-1.1.8-showfiles.patch
4e43e6566ff748ac355aac0cde9643d8173c03be  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
1058f002585440a9d53c7dbd4a4e4cf2778c0f21  ../SOURCES/rkhunter-1.2.7-datestamp.patch
ad40550fab9ada953546a83ab56586ffd183a160  ../SOURCES/rkhunter-1.2.7-append_log.patch
80148ca917ecd3117e1e2cf03237f188fa3632e7  ../SOURCES/rkhunter-1.2.7-group_log.patch
fbf80a4343c0be375a744215bf5b834f23734525  ../SOURCES/rkhunter-1.2.7-manpage.patch
f72d92d220edeaaaddc40155a22a2b4bc7d81b82  ../SOURCES/rkhunter-1.2.8-app_check_default.patch
85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d  ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rkhunter.spec	11 Mar 2006 21:02:45 -0000	1.7
+++ rkhunter.spec	17 Mar 2006 12:58:54 -0000	1.8
@@ -1,5 +1,5 @@
 %define rkhVer 1.2.8
-%define rpmRel 1
+%define rpmRel 2
 
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency, which rkhunter does not require
@@ -114,7 +114,7 @@
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -136,12 +136,12 @@
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
-%{__install} -m750 -p files/check_modules.pl    ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
-%{__install} -m750 -p files/check_port.pl       ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
-%{__install} -m750 -p files/check_update.sh     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
-%{__install} -m750 -p files/filehashmd5.pl      ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
-%{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
-%{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
+%{__install} -m750 -p files/check_modules.pl    ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
+%{__install} -m750 -p files/check_port.pl       ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
+%{__install} -m750 -p files/check_update.sh     ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
+%{__install} -m750 -p files/filehashmd5.pl      ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
+%{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
+%{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
 %{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
@@ -168,15 +168,15 @@
 %postun
 if [ "$1" = 0 ]; then
     [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name}
-    [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name}
+    [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name}
 fi
 
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/scripts
+%dir %{_prefix}/lib/%{name}
+%{_prefix}/lib/%{name}/scripts
 %{_sysconfdir}/cron.daily/01-%{name}
 %{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
@@ -190,6 +190,10 @@
 
 
 %changelog
+* Fri Mar 17 2006 Greg Houlette <tamaster at pobox.com> - 1.2.8-2
+- Fixed architectural dependency during package creation eliminating
+  use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting)
+
 * Tue Mar 7 2006 Greg Houlette <tamaster at pobox.com> - 1.2.8-1
 - New package version release
 - reworked the .spec file to support optional dist tag


--- rkhunter-1.2.8-1.src.sha DELETED ---




More information about the fedora-extras-commits mailing list