summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsiddall <rsiddall>2009-04-16 03:57:30 +0000
committerrsiddall <rsiddall>2009-04-16 03:57:30 +0000
commita3591b542c71c286de5a844d4bc2ca662fad11da (patch)
tree0e707acffb9c880772d6cbc6fe32c30d5580894f
parente0edfc9e94c625c0d3dc07ae5da925514f9e97a9 (diff)
More fixes for SuSE self-service:
1/ Put binaries in the right folder 2/ Make sure freeside group is created 3/ Make sure freeside home directory is created
-rw-r--r--install/rpm/freeside.spec26
1 files changed, 21 insertions, 5 deletions
diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index 601dfc83d..1e0a7e116 100644
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -144,6 +144,7 @@ perl -ni -e 'print if !/\s+chown\s+/;' Makefile
# Fix-ups for self-service. Should merge this into Makefile
perl -pi -e 's|/usr/local/sbin|%{_sbindir}|g' FS/bin/freeside-selfservice-server
perl -pi -e 's|/usr/local/bin|%{_bindir}|g' fs_selfservice/FS-SelfService/Makefile.PL
+perl -pi -e 's|/usr/local/sbin|%{_sbindir}|g' fs_selfservice/FS-SelfService/Makefile.PL
perl -pi -e 's|/usr/local/freeside|%{freeside_socket}|g' fs_selfservice/FS-SelfService/*.pm
perl -pi -e 's|socket\s*=\s*"/usr/local/freeside|socket = "%{freeside_socket}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
perl -pi -e 's|log_file\s*=\s*"/usr/local/freeside|log_file = "%{freeside_log}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
@@ -322,27 +323,42 @@ cd ../..
%pre
if ! %{__id} freeside &>/dev/null; then
- /usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+ /usr/sbin/groupadd freeside
+%endif
+ /usr/sbin/useradd -m freeside
fi
%pre mason
if ! %{__id} freeside &>/dev/null; then
- /usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+ /usr/sbin/groupadd freeside
+%endif
+ /usr/sbin/useradd -m freeside
fi
%pre postgresql
if ! %{__id} freeside &>/dev/null; then
- /usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+ /usr/sbin/groupadd freeside
+%endif
+ /usr/sbin/useradd -m freeside
fi
%pre mysql
if ! %{__id} freeside &>/dev/null; then
- /usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+ /usr/sbin/groupadd freeside
+%endif
+ /usr/sbin/useradd -m freeside
fi
%pre selfservice-cgi
if ! %{__id} freeside &>/dev/null; then
- /usr/sbin/useradd freeside
+%if "%{_vendor}" == "suse"
+ /usr/sbin/groupadd freeside
+%endif
+ /usr/sbin/useradd -m freeside
fi
%post