Changes of Revision 24
[-] | Changed | _service:set_version:ix-inventory-system.spec |
x 1
2 %define pkgname inventory-system 3 Name: ix-inventory-system 4 Release: 0 5 -Version: 0.0.5785 6 +Version: 0.0.5822 7 Url: http://www.internetx.com/ 8 License: GPLv2 9 Group: System 10
11 %else 12 %define wwwdir /var/www/inventory-system 13 %endif 14 -Requires: virt-what 15 +Requires: virt-what-inventory >= 1.12 16 Requires: lshw 17 %if 0%{?suse_version} 18 %if 0%{?suse_version} >= 1120 19
20 %clean 21 rm -rf %{buildroot} 22 23 +%post 24 +if [ -f /etc/init.d/cups ] ; then 25 + /sbin/chkconfig cups off || : 26 +fi 27 +if [ -f /etc/init.d/portreserve ] ; then 28 + /sbin/chkconfig portreserve off || : 29 +fi 30 + 31 %files 32 %defattr(-,root,root) 33 %config(noreplace) %{_sysconfdir}/%{pkgname}.conf 34 |
||
[+] | Changed | _service:recompress:tar_scm:inventory-system-0.0.5822.tar.bz2/server/client-status.php ^ |
@@ -3,8 +3,8 @@ // isdf - inventory system search // Author: Carsten Schoene // -// $LastChangedDate: 2013-05-02 20:11:51 +0200 (Thu, 02 May 2013) $ -// $Rev: 5785 $ +// $LastChangedDate: 2013-05-07 18:36:30 +0200 (Tue, 07 May 2013) $ +// $Rev: 5822 $ */ // define our name @@ -70,7 +70,7 @@ while (( $idrow = $idres->fetchRow(MDB2_FETCHMODE_ASSOC) )) { if ( $idrow['datakey'] == "get_system_software" ) { // extract inventory-system - preg_match('/(ix-)?inventory-system-\d+\.\d+\.rev\d+-\d+\.\d+/', $idrow['value'],$treffer); + preg_match('/(ix-)?inventory-system-\d+\.\d+\.(rev)?\d+-\d+\.\d+/', $idrow['value'],$treffer); $idrow['value'] = $treffer[0]; } elseif ( $idrow['datakey'] == "get_system_date" ) { // convert to unix timestamp |