[mw-devel] MW3 r1369 - trunk

[arthur at sucs.org]

Author: arthur
Date: 2014-05-30 16:39:19 +0100 (Fri, 30 May 2014)
New Revision: 1369

Modified:
   trunk/mw.spec
Log:
Comment out the systemd stuff for rpm, doesnt work on centos6


Modified: trunk/mw.spec
===================================================================
--- trunk/mw.spec	2014-05-30 13:54:11 UTC (rev 1368)
+++ trunk/mw.spec	2014-05-30 15:39:19 UTC (rev 1369)
@@ -7,10 +7,10 @@
 Group: Applications/Communications
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: readline sqlite js curl
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires: readline sqlite curl
+#Requires(post): systemd-units
+#Requires(preun): systemd-units
+#Requires(postun): systemd-units
 BuildRequires: libtermcap-devel readline-devel glibc-devel sqlite-devel curl-devel openssl-devel jansson-devel postgresql-devel cproto
 URL: http://projects.sucs.org/projects/mw/
 
@@ -28,7 +28,8 @@
 make DESTDIR=$RPM_BUILD_ROOT prefix=/usr libdir="%{_libdir}" install
 # We have a systemd unit file for mwserv so remove the sysv initscript
 rm -rf $RPM_BUILD_ROOT/etc/init.d
-install -Dm 0644 mw.service $RPM_BUILD_ROOT/%{_unitdir}/mw.service
+#install -Dm 0644 mw.service $RPM_BUILD_ROOT/%{_unitdir}/mwserv
+install -Dm 0644 mwserv.init $RPM_BUILD_ROOT/%{_initrddir}/mwserv
 install -D mozjs/%{_libdir}/libmozjs-17.0.so $RPM_BUILD_ROOT/%{_libdir}/
 mv $RPM_BUILD_ROOT%{_libdir}/mw/mwserv $RPM_BUILD_ROOT%{_bindir}
 %find_lang mw
@@ -45,21 +46,24 @@
 if [ $1 -eq 1 ] ; then 
     # Initial installation (disabled by default)
     # To enable after installation, do systemctl enable mw.service
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+#/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    /sbin/chkconfig mwserv on
 fi
 
 %preun
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
-    /bin/systemctl --no-reload disable mw.service > /dev/null 2>&1 || :
-    /bin/systemctl stop mw.service > /dev/null 2>&1 || :
+#    /bin/systemctl --no-reload disable mw.service > /dev/null 2>&1 || :
+#    /bin/systemctl stop mw.service > /dev/null 2>&1 || :
+    /sbin/service mwserv stop
+    /sbin/chkconfig mwserv off
 fi
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+#/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
-    /bin/systemctl try-restart mw.service >/dev/null 2>&1 || :
+    #/bin/systemctl try-restart mw.service >/dev/null 2>&1 || :
 fi
 
 %files -f mw.lang
@@ -75,7 +79,8 @@
 %{_libdir}/mw/scripthelp
 %{_libdir}/mw/talkhelp
 %{_libdir}/mw/wizhelp
-%{_unitdir}/mw.service
+%{_initrddir}/mwserv
+#%{_unitdir}/mw.service
 %attr (4711,mw,mw) %{_bindir}/mw
 %attr (755,mw,mw) %{_bindir}/mwserv
 %attr (4711,mw,mw) %{_libdir}/mw/mwpoll