Changes - j0ke.net Open Build Service

Changes of Revision 22

[-] [+]	Changed	_service:set_version:inventory-system.spec
@@ -1,4 +1,4 @@ -%define pkgname client +%define pkgname inventory-system Name: inventory-system Release: 0 Version: 0.0.rev1477 @@ -9,6 +9,11 @@ Source0: %{pkgname}-%{version}.tar.bz2 Source1: %{name}.conf BuildRoot: %{_tmppath}/%{name}-%{version}-root +%if 0&{?suse_version} +%define wwwdir /srv/www/inventory-system +%else +%define wwwdir /var/www/inventory-system +%endif Requires: virt-what Requires: lshw %if 0%{?suse_version} @@ -27,19 +32,31 @@ Requires: net-tools %description -Systme inventory reporting tool. It uses various tools +System inventory reporting tool. It uses various tools to detect system information and hardware, virtualization type, serial and so on. +%package server +Group: System +Summary: Server part of inventory-system +Requires: php5-mysql + +%description server +System inventory server includes php scripts for collecting +submitted data by inventory-reporting tool. Collected data +is save to mysql database. + %prep %setup -n %{pkgname}-%{version} %build %install -%__install -D -m755 %{name}.sh %{buildroot}%{_sbindir}/%{name} -%__install -D -m755 cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem +%__install -D -m755 client/%{name}.sh %{buildroot}%{_sbindir}/%{name} +%__install -D -m755 client/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem %__install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/%{name}.conf +%__install -d %{buildroot}/%{wwwdir} +%__install -m644 server/*.php %{buildroot}/%{wwwdir}/ %clean rm -rf %{buildroot} @@ -50,4 +67,9 @@ %{_sysconfdir}/cron.daily/inventorysystem %{_sbindir}/%{name} +%files server +%dir %{wwwdir} +%config %{wwwdir}/config.inc.php +%{wwwdir}/isdf.php + %changelog
[-] [+]	Changed	inventory-system.spec ^
@@ -1,4 +1,4 @@ -%define pkgname client +%define pkgname inventory-system Name: inventory-system Release: 0 Version: 0.0.1 @@ -9,6 +9,11 @@ Source0: %{pkgname}-%{version}.tar.bz2 Source1: %{name}.conf BuildRoot: %{_tmppath}/%{name}-%{version}-root +%if 0&{?suse_version} +%define wwwdir /srv/www/inventory-system +%else +%define wwwdir /var/www/inventory-system +%endif Requires: virt-what Requires: lshw %if 0%{?suse_version} @@ -27,19 +32,31 @@ Requires: net-tools %description -Systme inventory reporting tool. It uses various tools +System inventory reporting tool. It uses various tools to detect system information and hardware, virtualization type, serial and so on. +%package server +Group: System +Summary: Server part of inventory-system +Requires: php5-mysql + +%description server +System inventory server includes php scripts for collecting +submitted data by inventory-reporting tool. Collected data +is save to mysql database. + %prep %setup -n %{pkgname}-%{version} %build %install -%__install -D -m755 %{name}.sh %{buildroot}%{_sbindir}/%{name} -%__install -D -m755 cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem +%__install -D -m755 client/%{name}.sh %{buildroot}%{_sbindir}/%{name} +%__install -D -m755 client/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem %__install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/%{name}.conf +%__install -d %{buildroot}/%{wwwdir} +%__install -m644 server/*.php %{buildroot}/%{wwwdir}/ %clean rm -rf %{buildroot} @@ -50,4 +67,9 @@ %{_sysconfdir}/cron.daily/inventorysystem %{_sbindir}/%{name} +%files server +%dir %{wwwdir} +%config %{wwwdir}/config.inc.php +%{wwwdir}/isdf.php + %changelog
[-] [+]	Changed	_service ^
@@ -1,3 +1,3 @@ <services> - <service name="tar_scm"><param name="password">distro</param><param name="versionprefix">0.0</param><param name="scm">svn</param><param name="username">distro</param><param name="url">https://svn.muc.internetx.de/svn/trunk/people/carsten.schoene/inventory-system/client/</param></service> -<service name="set_version"/><service name="recompress"><param name="file">.tar</param><param name="compression">bz2</param></service></services> \ No newline at end of file + <service name="tar_scm"><param name="password">distro</param><param name="versionprefix">0.0</param><param name="scm">svn</param><param name="username">distro</param><param name="url">https://svn.muc.internetx.de/svn/trunk/people/carsten.schoene/inventory-system/</param></service> +<service name="set_version"/><service name="recompress"><param name="file">.tar</param><param name="compression">bz2</param></service></services>
	Deleted	_service:recompress:tar_scm:client-0.0.rev1477.tar.bz2 ^
	Added	_service:recompress:tar_scm:inventory-system-0.0.rev1477.tar.bz2 ^