/[smecontribs]/rpms/ocsinventory/contribs7/ocsinventory.spec

Diff of /rpms/ocsinventory/contribs7/ocsinventory.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.2 by slords,
Mon Mar  2 23:53:29 2009 UTC
+Revision 1.4 by vip-ire,
Fri Jun 12 15:28:19 2009 UTC
 Line 1
- # $Id$
+ # $Id: ocsinventory.spec,v 1.3 2009/03/18 14:37:45 slords Exp $
  # Authority: vip-ire
  # Name: Daniel Berteaud
+ %if %{?fedora}%{?rhel} >= 5
+ %define useselinux 1
+ %else
+ %define useselinux 0
+ %endif
+ %define tarname OCSNG_UNIX_SERVER-1.02.1
  Name:        ocsinventory
  Summary:     Open Computer and Software Inventory Next Generation
- Version:     1.02
+ Version:     1.02.1
- Release:     2.rc3%{?dist}
+ Release:     1%{?dist}
  Group:       Applications/Internet
  License:     GPLv2
  URL:         http://www.ocsinventory-ng.org/
- Source0:     OCSNG_UNIX_SERVER_1.02RC3.tar.gz
+ Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
  Source1:     ocsinventory-reports.conf
- Source2:     ocsinventory-images.tgz
- Source3:     OCSNG_UNIX_SERVER_1.02RC3_Patch1.tar.gz
  BuildArch:   noarch
  BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires: perl(ExtUtils::MakeMaker)
+ BuildRequires: perl(Apache::DBI)
+ BuildRequires: perl(DBD::mysql)
+ BuildRequires: perl(Net::IP)
+ BuildRequires: perl(XML::Simple)
  # Main package is a dummy package
  Requires:    ocsinventory-server  = %{version}-%{release}
-Line 35 
 computers configuration and software tha
+Line 45 
 computers configuration and software tha
  OCS Inventory is also able to detect all active devices on your network,
  such as switch, router, network printer and unattended devices.
- OCS Inventory NG includes package deployment feature on client computers
+ OCS Inventory NG includes package deployment feature on client computers.
+ ocsinventory is a metapackage that will install the communication server,
+ the administration console and the database server (MySQL).
  %description -l fr
  Open Computer and Software Inventory Next Generation est une application
- déstinée pour aider l'administrateur système ou réseau à garder un oeil
+ destinée à aider l'administrateur système ou réseau à garder un oeil
  sur la configuration des machines du réseau et sur les logiciels qui y
  sont installés.
  OCS Inventory est aussi capable de détecter tout périphérique actif sur
- le réseau, comme les commutateurs, routeurs, imprimantes et autres matéreils
+ le réseau, comme les commutateurs, routeurs, imprimantes et autres matériels
- inattendus.
+ autonomes.
  OCS Inventory NG intègre des fonctionnalités de télédiffusion de paquets
  sur les machines clients.
+ ocsinventory est un metapaquet qui installera le serveur de communication,
+ la console d'administration et le serveur de base de données (MySQL).
  %package server
  Group:    Applications/Internet
  Summary:  OCS Inventory NG - Communication server
  Requires: mod_perl
+ %if 0%{?rhel} != 4
+ # when use with mod_perl2
+ Requires: perl(SOAP::Transport::HTTP2)
+ %endif
  Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
- Requires: perl(Compress::Zlib) >= 1.33
+ # Required by the original setup script, but not detected automatically :
- Requires: perl(DBI) >= 1.40
+ # Apache::DBI drags in DBI
- Requires: perl(Apache::DBI) >= 0.93
+ Requires: perl(Apache::DBI)
- Requires: perl(DBD::mysql) >= 2.9004
+ Requires: perl(Net::IP)
- Requires: perl(XML::Simple) >= 2.12
+ Requires: perl(DBD::mysql)
- Requires: perl(Net::IP) >= 1.21
+ # Optional, not detected automatically :
- Requires: perl(SOAP::Lite) >= 0.66
+ Requires: perl(SOAP::Lite)
- Requires: perl(XML::Entities) >= 0.02
+ Requires: perl(XML::Entities)
+ %if %{useselinux}
+ Requires: policycoreutils
+ %endif
  %description server
  This package provides the Communication server, which will handle HTTP
-Line 78 
 de données.
+Line 100 
 de données.
  %package reports
  Group:    Applications/Internet
  Summary:  OCS Inventory NG - Communication server
+ # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib
  Requires: php
- Requires: perl(DBI) >= 1.40
+ Requires: php-mysql php-zip php-gd
- Requires: perl(DBD::mysql) >= 2.9004
+ %if 0%{?rhel} == 4
- Requires: perl(XML::Simple) >= 2.12
+ Requires:       php-domxml
- Requires: perl(Net::IP) >= 1.21
+ %else
+ Requires:       php-xml
+ %endif
+ # Required by the original setup script, but not detected automatically :
+ Requires: perl(DBD::mysql)
+ # Required by ipdiscover-util.pl (nmap and nmblookup)
+ Requires: nmap samba-client
+ %if %{useselinux}
+ Requires: policycoreutils
+ %endif
  %description reports
  This package provides the Administration console, which will allow
-Line 93 
 Ce paquet fournit la console d'administr
+Line 125 
 Ce paquet fournit la console d'administr
  qui autorise les administrateurs à interroger la base de données via leur
  navigateur favori.
  %prep
- %setup -q -n OCSNG_UNIX_SERVER_1.02RC3
+ %setup -q -n %{tarname}
- tar xzf %{SOURCE2}
- tar xzf %{SOURCE3}
- # patching doc_root => /var/lib
- for fic in $(find ocsreports -type f -exec grep -q "DOCUMENT_ROOT" {} \; -print)
- do
-         %{__sed} -i -e 's;\$_SERVER\["DOCUMENT_ROOT"\];"%{_localstatedir}/lib/ocsinventory-server";' $fic
- done
  %build
  cd Apache
  %{__perl} Makefile.PL INSTALLDIRS=vendor
  make %{?_smp_mflags}
  %install
  rm -rf %{buildroot}
-Line 136 
 rm -f %{buildroot}%{perl_vendorlib}/Apac
+Line 161 
 rm -f %{buildroot}%{perl_vendorlib}/Apac
  %{__sed} -e 's;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;' \
     ./etc/logrotate.d/ocsinventory-server >%{buildroot}%{_sysconfdir}/logrotate.d/ocsinventory-server
- # default configuration (localhost) sould work on "simple" installation
+ # default configuration (localhost) should work on "simple" installation
  %{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
  %{__sed} -e "s;DATABASE_SERVER;localhost;g" \
-          -e "s;DATABASE_PORT;3306;g" \
+     -e "s;DATABASE_PORT;3306;g" \
  %if 0%{?rhel} == 4
-          -e "s;VERSION_MP;1;g" \
+     -e "s;VERSION_MP;1;g" \
  %else
-          -e "s;VERSION_MP;2;g" \
+     -e "s;VERSION_MP;2;g" \
  %endif
-          -e "s;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;g" \
+     -e "s;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;g" \
-          ./etc/ocsinventory/ocsinventory-server.conf >%{buildroot}%{_sysconfdir}/httpd/conf.d/z-ocsinventory-server.conf
+     ./etc/ocsinventory/ocsinventory-server.conf | \
+     grep -v IfModule >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
  cd ..
  # --- ocsinventory-reports --- administration console
-Line 156 
 cp -ar ocsreports %{buildroot}/%{_datadi
+Line 182 
 cp -ar ocsreports %{buildroot}/%{_datadi
  find %{buildroot}/%{_datadir}/ocsinventory-reports \( -name \*.php -o -name \*.css \) -exec chmod -x {} \;
  %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
  mv %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php \
     %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
  ln -s ../../../../%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php
- %{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-server/{download,ipd}
+ %{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-reports/{download,ipd}
  %{__install} -pm 755 Apache/binutils/ipdiscover-util.pl %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/ipdiscover-util.pl
-Line 168 
 ln -s ../../../../%{_sysconfdir}/ocsinve
+Line 195 
 ln -s ../../../../%{_sysconfdir}/ocsinve
  %{__sed} -e "s;OCSREPORTS_ALIAS;/ocsreports;g" \
           -e "s;PATH_TO_OCSREPORTS_DIR;%{_datadir}/ocsinventory-reports/ocsreports;g" \
           -e "s;PACKAGES_ALIAS;/download;g" \
-          -e "s;PATH_TO_PACKAGES_DIR;%{_localstatedir}/lib/ocsinventory-server/download;g" \
+          -e "s;PATH_TO_PACKAGES_DIR;%{_localstatedir}/lib/ocsinventory-reports/download;g" \
-     %{SOURCE1} >%{buildroot}%{_sysconfdir}/httpd/conf.d/z-ocsinventory-reports.conf
+     %{SOURCE1} >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf
  %clean
  rm -rf %{buildroot}
+ %post server
+ %if %{useselinux}
+ (
+ # New File context
+ semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?"
+ # files created by app
+ restorecon -R %{_localstatedir}/log/ocsinventory-server
+ ) &>/dev/null ||:
+ %endif
+ %post reports
+ %if %{useselinux}
+ (
+ # New File context
+ semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?"
+ semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-reports(/.*)?"
+ # files created by app
+ restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
+ restorecon -R %{_localstatedir}/lib/ocsinventory-reports
+ ) &>/dev/null ||:
+ %endif
+ %postun server
+ %if %{useselinux}
+ if [ "$1" -eq "0" ]; then
+     # Remove the File Context
+     semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
+ fi
+ %endif
+ %postun reports
+ %if %{useselinux}
+ if [ "$1" -eq "0" ]; then
+     # Remove the File Context
+     semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+     semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
+ fi
+ %endif
  %files
  %defattr(-, root, root, -)
-Line 183 
 rm -rf %{buildroot}
+Line 254 
 rm -rf %{buildroot}
  %defattr(-, root, root, -)
  %doc LICENSE.txt README
  %config(noreplace) %{_sysconfdir}/logrotate.d/ocsinventory-server
- %config(noreplace) %{_sysconfdir}/httpd/conf.d/z-ocsinventory-server.conf
+ %config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
- %attr(750,www,root) %{_localstatedir}/log/ocsinventory-server
+ %attr(755,www,root) %{_localstatedir}/log/ocsinventory-server
  %{perl_vendorlib}/Apache
-Line 194 
 rm -rf %{buildroot}
+Line 265 
 rm -rf %{buildroot}
  %dir %{_sysconfdir}/ocsinventory
  %dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
  %attr(640,www,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
- %config(noreplace) %{_sysconfdir}/httpd/conf.d/z-ocsinventory-reports.conf
+ %config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf
  %{_datadir}/ocsinventory-reports
- %dir %{_localstatedir}/lib/ocsinventory-server
+ %attr(755,www,root) %dir %{_localstatedir}/lib/ocsinventory-reports
- %attr(750,www,root) %dir %{_localstatedir}/lib/ocsinventory-server/ipd
+ %attr(755,www,root) %dir %{_localstatedir}/lib/ocsinventory-reports/ipd
- %attr(750,www,root) %dir %{_localstatedir}/lib/ocsinventory-server/download
+ %attr(755,www,root) %dir %{_localstatedir}/lib/ocsinventory-reports/download
  %changelog
- * Tue Dec 09 2008 Daniel B. <daniel@firewall-services.com> 1.02-2.rc1
+ * Fri Jun 12 2009 Daniel B. <daniel@firewall-services.com> 1.02.1-1.el4.sme
- - Apply patch1 for ocs-inventory 1.02RC3
+ - update to OCS Inventory NG 1.02.1
+ * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 1.02-0.10.rc3.el4.2
+ - Changes for SME Server (apache=>www)
+ * Sun Jan 18 2009 Remi Collet <Fedora@famillecollet.com> 1.02-0.10.rc3.el4.1
+ - fix php-xml > php-domxml in EL-4
+ * Sun Jan 11 2009 Remi Collet <Fedora@famillecollet.com> 1.02-0.10.rc3
+ - add r1447 and r1462 patch
+ - change log selinux context (httpd_log_t)
+ * Fri Oct 17 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.9.rc3
+ - upstream r1423 patch - migration script
+ * Sat Oct 11 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.8.rc3
+ - upstream r1413 patch - database schema
+ * Sat Oct 11 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.7.rc3
+ - update to RC3
+ * Tue Jul 22 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.6.rc2
+ - add missing requires perl(SOAP::Transport::HTTP2) (with mod_perl2)
+ - AddDefaultCharset ISO-8859-1 in httpd config
+ - fix SElinux path
+ * Sat Jun 14 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.5.rc2
+ - change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports
+ - add Requires nmap and samba-client (nmblookup)
+ * Sun May 18 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.4.rc2
+ - remove <IfModule> from ocsinventory-server.conf
+ - change perm to 755 on /var/lib/ocsinventory-server
+ - metapackage description closer to upstream components name
+ - add BR perl(DBD::mysql) to avoid build warning
+ * Fri May 16 2008 Xavier Bachelot <xavier@bachelot.org> 1.02-0.3.rc2.1
+ - Fix BuildRequires and Requires.
+ - Fix %%description french translations and a few typos.
+ - Rename apache confs.
+ * Sat May 10 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.3.rc2
+ - add missing requires for php extensions (from PHP_Compat result)
+ - add selinux stuff
- * Thu Sep 10 2008 Daniel B. <daniel@firewall-services.com> 1.02-02.rc1
+ * Thu May 08 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.2.rc2
- - small changes for SME server
+ - update to RC2
  * Sun Mar 15 2008 Remi Collet <Fedora@famillecollet.com> 1.02-0.2.rc1
  - fix download dir

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1