Merge branch 'rpm'

Antonio Terceiro
2 parents c9b39e42 17e3d9f2
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
colab.spec
 %define name colab
 %define version 2.0a2
 %define unmangled_version 2.0a2
-%define release 1
+%define release 2
 %define buildvenv /var/tmp/%{name}-%{version}
  
 Summary: Collaboration platform for communities
@@ -54,7 +54,7 @@ cat &gt; %{buildroot}/%{_bindir}/colab-admin &lt;&lt;EOF
 #!/bin/sh
 set -e
  
-if [ "$USER" = colab ]; then
+if [ "\$USER" = colab ]; then
   exec /usr/lib/colab/bin/colab-admin "\$@"
 else
   exec sudo -u colab /usr/lib/colab/bin/colab-admin "\$@"
1	1	%define name colab
2	2	%define version 2.0a2
3	3	%define unmangled_version 2.0a2
4		-%define release 1
	4	+%define release 2
5	5	%define buildvenv /var/tmp/%{name}-%{version}
6	6
7	7	Summary: Collaboration platform for communities
...	...	@@ -54,7 +54,7 @@ cat > %{buildroot}/%{_bindir}/colab-admin <<EOF
54	54	#!/bin/sh
55	55	set -e
56	56
57		-if [ "$USER" = colab ]; then
	57	+if [ "\$USER" = colab ]; then
58	58	exec /usr/lib/colab/bin/colab-admin "\$@"
59	59	else
60	60	exec sudo -u colab /usr/lib/colab/bin/colab-admin "\$@"
...	...