hguemar pushed to omniORB (epel7). "update omniORB (..more)"

[notifications at fedoraproject.org]

>From 0730143ab0a9df19e92bb053fa8bbe20a0341b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
Date: Tue, 10 Sep 2013 19:33:47 +0200
Subject: update omniORB

upstream 4.1.7 (RHBZ #1005607)
macroized systemd scriptlets (RHBZ #850239)

diff --git a/.gitignore b/.gitignore
index 35134ef..ed9dcd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /omniORB-4.1.6.tar.bz2
+/omniORB-4.1.7.tar.bz2
diff --git a/omniORB.spec b/omniORB.spec
index c360e62..af07c37 100644
--- a/omniORB.spec
+++ b/omniORB.spec
@@ -12,8 +12,8 @@
 %bcond_without openssl
 
 Name:           omniORB
-Version:        4.1.6
-Release:        5%{?dist}
+Version:        4.1.7
+Release:        1%{?dist}
 Summary:        A robust high performance CORBA ORB for C++ and Python
 
 Group:          System Environment/Libraries
@@ -30,9 +30,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 %{!?_without_openssl:BuildRequires:  openssl-devel}
 %if 0%{?with_systemd}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 %else
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -162,24 +162,14 @@ exit 0
 
 %if 0%{?with_systemd}
 %post servers
-if [ $1 -eq 1 ]; then
-  # Package install, not upgrade
-  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post omniNames.service
 
 %preun servers
-if [ $1 -eq 0 ] ; then
-  # Package removal, not upgrade
-  /bin/systemctl disable omniNames.service > /dev/null 2>&1 || :
-  /bin/systemctl stop omniNames.service > /dev/null 2>&1 || :
-fi
+%systemd_preun omniNames.service
 
 %postun servers
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-  # Package upgrade, not uninstall
-  /bin/systemctl try-restart omniNames.service >/dev/null 2>&1 || :
-fi
+%systemd_postun omniNames.service
+
 %else
 %post servers
 /sbin/chkconfig --add %{nameserver}
@@ -253,6 +243,10 @@ fi
 
 
 %changelog
+* Tue Sep 10 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 4.1.7-1
+- upstream 4.1.7 (RHBZ #1005607)
+- macroized systemd scriptlets (RHBZ #850239)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 53fe0d6..1965187 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44990f8139c349b53ab43110de6c629b  omniORB-4.1.6.tar.bz2
+ce8cbe25418a76a2aac5395399463362  omniORB-4.1.7.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/omniORB.git/commit/?h=epel7&id=0730143ab0a9df19e92bb053fa8bbe20a0341b9a