Packman Build Service PMBS

Changes of Revision 12

mythtv.changes Changed

mythtv.spec Changed

@@ -20,9 +20,9 @@
 %define major 0_28
 %define soname libmyth
 %define sover  0_28-0
-%define USER mythtv
-%define GROUP video
-%define OTHERGROUP audio
+%define SYSUSER mythtv
+%define SYSGROUP video
+%define OTHERSYSGROUP audio
 # Fix: suse-filelist-forbidden-sysconfig
 %{!?_fillupdir:%global _fillupdir /var/adm/fillup-templates}
 Name:           mythtv
@@ -558,8 +558,8 @@
 cp -a %{SOURCE93} %{SOURCE94} %{SOURCE95} %{SOURCE96} %{SOURCE97} %{SOURCE98} %{SOURCE99} .
 
 for file in mythbackend.service.in mythbackend.logrotate.in; do
-    sed -e's|@USER@|%{USER}|g' \
-        -e's|@GROUP@|%{GROUP}|g' \
+    sed -e's|@SYSUSER@|%{SYSUSER}|g' \
+        -e's|@SYSGROUP@|%{SYSGROUP}|g' \
         -i $file
 done
 
@@ -770,9 +770,9 @@
 
 %pre backend
 if [ $1 -eq 1 ]; then
-    if ! %{_bindir}/id %{USER} &>/dev/null; then
-        %{_sbindir}/useradd -r -c "MythTV Backend User" -g %{GROUP} -G %{OTHERGROUP} \
-        -s /sbin/nologin -d %{_localstatedir}/lib/%{name} %{USER} 2> /dev/null || :
+    if ! %{_bindir}/id %{SYSUSER} &>/dev/null; then
+        %{_sbindir}/useradd -r -c "MythTV Backend User" -g %{SYSGROUP} -G %{OTHERSYSGROUP} \
+        -s /sbin/nologin -d %{_localstatedir}/lib/%{name} %{SYSUSER} 2> /dev/null || :
     fi
 fi
 
@@ -789,7 +789,7 @@
 %postun backend
 %service_del_postun mythbackend.service
 if [ $1 -eq 0 ]; then
-    userdel %{USER} || logger "User \"%{USER}\" could not be deleted."
+    userdel %{SYSUSER} || logger "User \"%{SYSUSER}\" could not be deleted."
     rm -rf %{_localstatedir}/{lib/%{name},log/%{name},cache/%{name}}
     %udev_rules_update
 fi
@@ -856,10 +856,10 @@
 %{_datadir}/%{name}/backend-config
 %{_datadir}/%{name}/MXML_scpd.xml
 %{_fillupdir}/sysconfig.mythbackend
-%attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/lib/mythtv
-%attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/cache/mythtv
-%attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/log/%{name}
-%attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/log/%{name}/old
+%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/lib/mythtv
+%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/cache/mythtv
+%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/%{name}/old
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mythbackend
 %config %{_sysconfdir}/logrotate.d/%{name}
 %{_sbindir}/rcmythbackend