summaryrefslogtreecommitdiffstats
path: root/ocsinventory.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-10-27 18:29:53 +0200
committerRemi Collet <fedora@famillecollet.com>2011-10-27 18:29:53 +0200
commite978f882d02861b45e93c3a82f67d685863ccd2e (patch)
treef26ff92f06b276d8353d64954df5d04d6ab65c3c /ocsinventory.spec
parent75eccfa59bbaf55dacc7153deaa4672fc6a0c74d (diff)
ocsinventory: improve upgrade from 1.3.3
Diffstat (limited to 'ocsinventory.spec')
-rw-r--r--ocsinventory.spec16
1 files changed, 13 insertions, 3 deletions
diff --git a/ocsinventory.spec b/ocsinventory.spec
index 4dcd5ce..4e76e9f 100644
--- a/ocsinventory.spec
+++ b/ocsinventory.spec
@@ -12,7 +12,7 @@ Name: ocsinventory
Summary: Open Computer and Software Inventory Next Generation
Version: 2.0.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Group: Applications/Internet
License: GPLv2
@@ -22,6 +22,8 @@ URL: http://www.ocsinventory-ng.org/
Source0: http://launchpad.net/ocsinventory-server/stable-2.0/%{version}/+download/%{tarname}-%{version}.tar.gz
Source1: ocsinventory-reports.conf
+# Manage upgrade from 1.3.x
+Patch0: %{name}-upgrade.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,6 +131,8 @@ navigateur favori.
%prep
%setup -q -n %{tarname}-%{version}
+%patch0 -p0
+
chmod -x binutils/ocs-errors
%build
@@ -229,6 +233,7 @@ semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocs
restorecon -R %{_localstatedir}/log/ocsinventory-server
) &>/dev/null ||:
%endif
+/sbin/service httpd condrestart > /dev/null 2>&1 || :
%post reports
@@ -245,12 +250,13 @@ restorecon -R %{_localstatedir}/lib/ocsinventory-reports
%postun server
-%if %{useselinux}
if [ "$1" -eq "0" ]; then
+%if %{useselinux}
# Remove the File Context
semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
-fi
%endif
+ /sbin/service httpd condrestart > /dev/null 2>&1 || :
+fi
%postun reports
@@ -296,6 +302,10 @@ fi
%changelog
+* Thu Oct 27 2011 Remi Collet <Fedora@famillecollet.com> - 2.0.2-1.1
+- add patch for upgrade from 1.3.x
+- restart apache
+
* Sun Oct 23 2011 Remi Collet <Fedora@famillecollet.com> - 2.0.2-1
- update to 2.0.2