[sabayon] Review fixes.
Jon Ciesla
limb at fedoraproject.org
Thu Apr 26 16:22:21 UTC 2012
commit 0add8c096e2f8357400078ad7115da9574ef8f25
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Apr 26 11:22:14 2012 -0500
Review fixes.
sabayon.spec | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/sabayon.spec b/sabayon.spec
index 3034a40..e0e6924 100644
--- a/sabayon.spec
+++ b/sabayon.spec
@@ -8,7 +8,7 @@
Name: sabayon
Version: 2.30.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Tool to maintain user profiles in a GNOME desktop
Group: Applications/System
@@ -95,9 +95,9 @@ done
%build
-%configure \
- --enable-console-helper=yes \
- --with-prototype-user=%{name}
+%configure \
+ --enable-console-helper=yes \
+ --with-prototype-user=%{name}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -112,9 +112,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2
echo 'include "$(HOME)/.gconf.path.defaults"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path
-desktop-file-install --vendor gnome --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor gnome --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
# We don't want these
rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/xlib.la
@@ -148,12 +148,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
-if [ $1 -eq 0 ]; then
- /usr/sbin/userdel %{name} &>/dev/null || :
- /usr/sbin/groupdel %{name} &>/dev/null || :
-fi
-
-
%files apply -f sabayon.lang
%defattr(-, root, root, 755)
@@ -222,6 +216,9 @@ fi
%changelog
+* Thu Apr 26 2012 Jon Ciesla <limburgher at gmail.com> - 2.30.1-5
+- Stop deleting user, cleaned up indentation for merge review BZ 557760.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list