Logoj0ke.net Open Build Service > Projects > home:netmax:tools > inventory-system > Changes
Sign Up | Log In

Changes of Revision 22

[-] Changed _service:set_version:inventory-system.spec
x
 
1
@@ -1,4 +1,4 @@
2
-%define        pkgname client
3
+%define        pkgname inventory-system
4
 Name:      inventory-system
5
 Release: 0
6
 Version: 0.0.rev1477
7
@@ -9,6 +9,11 @@
8
 Source0:   %{pkgname}-%{version}.tar.bz2
9
 Source1:   %{name}.conf
10
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
11
+%if 0&{?suse_version}
12
+%define wwwdir /srv/www/inventory-system
13
+%else
14
+%define wwwdir /var/www/inventory-system
15
+%endif
16
 Requires:  virt-what
17
 Requires:  lshw
18
 %if 0%{?suse_version}
19
@@ -27,19 +32,31 @@
20
 Requires:  net-tools
21
 
22
 %description
23
-Systme inventory reporting tool. It uses various tools
24
+System inventory reporting tool. It uses various tools
25
 to detect system information and hardware, virtualization type,
26
 serial and so on.
27
 
28
+%package server
29
+Group:     System
30
+Summary:   Server part of inventory-system
31
+Requires:  php5-mysql
32
+
33
+%description server
34
+System inventory server includes php scripts for collecting
35
+submitted data by inventory-reporting tool. Collected data
36
+is save to mysql database.
37
+
38
 %prep
39
 %setup -n %{pkgname}-%{version}
40
 
41
 %build
42
 
43
 %install
44
-%__install -D -m755 %{name}.sh %{buildroot}%{_sbindir}/%{name}
45
-%__install -D -m755 cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem
46
+%__install -D -m755 client/%{name}.sh %{buildroot}%{_sbindir}/%{name}
47
+%__install -D -m755 client/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem
48
 %__install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/%{name}.conf
49
+%__install -d %{buildroot}/%{wwwdir}
50
+%__install -m644 server/*.php %{buildroot}/%{wwwdir}/
51
 
52
 %clean
53
 rm -rf %{buildroot}
54
@@ -50,4 +67,9 @@
55
 %{_sysconfdir}/cron.daily/inventorysystem
56
 %{_sbindir}/%{name}
57
 
58
+%files server
59
+%dir %{wwwdir}
60
+%config %{wwwdir}/config.inc.php
61
+%{wwwdir}/isdf.php
62
+
63
 %changelog
64
[-] Changed inventory-system.spec ^
64
 
1
@@ -1,4 +1,4 @@
2
-%define        pkgname client
3
+%define        pkgname inventory-system
4
 Name:      inventory-system
5
 Release:   0
6
 Version:   0.0.1
7
@@ -9,6 +9,11 @@
8
 Source0:   %{pkgname}-%{version}.tar.bz2
9
 Source1:   %{name}.conf
10
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
11
+%if 0&{?suse_version}
12
+%define wwwdir /srv/www/inventory-system
13
+%else
14
+%define wwwdir /var/www/inventory-system
15
+%endif
16
 Requires:  virt-what
17
 Requires:  lshw
18
 %if 0%{?suse_version}
19
@@ -27,19 +32,31 @@
20
 Requires:  net-tools
21
 
22
 %description
23
-Systme inventory reporting tool. It uses various tools
24
+System inventory reporting tool. It uses various tools
25
 to detect system information and hardware, virtualization type,
26
 serial and so on.
27
 
28
+%package server
29
+Group:     System
30
+Summary:   Server part of inventory-system
31
+Requires:  php5-mysql
32
+
33
+%description server
34
+System inventory server includes php scripts for collecting
35
+submitted data by inventory-reporting tool. Collected data
36
+is save to mysql database.
37
+
38
 %prep
39
 %setup -n %{pkgname}-%{version}
40
 
41
 %build
42
 
43
 %install
44
-%__install -D -m755 %{name}.sh %{buildroot}%{_sbindir}/%{name}
45
-%__install -D -m755 cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem
46
+%__install -D -m755 client/%{name}.sh %{buildroot}%{_sbindir}/%{name}
47
+%__install -D -m755 client/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/inventorysystem
48
 %__install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/%{name}.conf
49
+%__install -d %{buildroot}/%{wwwdir}
50
+%__install -m644 server/*.php %{buildroot}/%{wwwdir}/
51
 
52
 %clean
53
 rm -rf %{buildroot}
54
@@ -50,4 +67,9 @@
55
 %{_sysconfdir}/cron.daily/inventorysystem
56
 %{_sbindir}/%{name}
57
 
58
+%files server
59
+%dir %{wwwdir}
60
+%config %{wwwdir}/config.inc.php
61
+%{wwwdir}/isdf.php
62
+
63
 %changelog
64
[+] Changed _service ^
Deleted _service:recompress:tar_scm:client-0.0.rev1477.tar.bz2 ^
Added _service:recompress:tar_scm:inventory-system-0.0.rev1477.tar.bz2 ^