[partimage/el6/master] Initial version for rhel6.

[Paulo Roma Cavalcanti]

commit c2c21e7cb7e856750580572a08588593a5b01fd8
Author: Paulo Roma Cavalcanti <roma at cascavel.(none)>
Date:   Sat Jan 8 07:02:37 2011 -0200

    Initial version for rhel6.

 .gitignore                  |    3 +++
 partimage-0.6.8-gcc44.patch |   24 ------------------------
 partimage.spec              |   33 ++++++++++++++++++---------------
 sources                     |    2 +-
 4 files changed, 22 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index caf0eee..c88034e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 partimage-man.tar.gz
 partimage-scripts.tar.gz
 partimage-0.6.8.tar.bz2
+/partimage-0.6.9.tar.bz2
+/partimage-man.tar.gz
+/partimage-scripts.tar.gz
diff --git a/partimage.spec b/partimage.spec
index bf75de6..15eae29 100644
--- a/partimage.spec
+++ b/partimage.spec
@@ -12,8 +12,8 @@
 
 Summary: Partition imaging utility, much like Ghost
 Name:    partimage
-Version: 0.6.8
-Release: 2%{?dist}
+Version: 0.6.9
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://www.partimage.org/
@@ -21,7 +21,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1: %{name}-man.tar.gz
 Source2: %{name}-scripts.tar.gz
 Source3: README.partimage.html
-Patch0:  partimage-0.6.8-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: autoconf 
@@ -35,9 +34,9 @@ BuildRequires: zlib-devel
 
 %{?with_pam:Requires: compat-db}
 Requires(post):   chkconfig /sbin/service
-Requires(postun): chkconfig /usr/sbin/userdel
+Requires(postun): chkconfig shadow-utils
 Requires(preun):  chkconfig /sbin/service
-Requires(pre):    /usr/sbin/useradd
+Requires(pre):    shadow-utils
 
 %description
 Partimage is a Linux/UNIX partition imaging utility,
@@ -66,8 +65,7 @@ This package contains the server daemon for remote imaging.
 
 %prep
 %setup -q -a1 -a2
-%patch0 -p1 -b .gcc44
-for i in ./TODO ./README ./ChangeLog ./THANKS ./README.partimaged; do
+for i in ./README ./ChangeLog ./THANKS ./README.partimaged; do
         iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
         mv "${i}_" "$i"
 done
@@ -162,8 +160,11 @@ touch %{buildroot}%{_localstatedir}/log/partimaged/partimaged.log
 
 
 %pre server
-/usr/sbin/useradd -M -r -s /sbin/nologin -d %{image_place} \
-            -c "Partition imaging utility" partimag > /dev/null 2>&1 || :
+getent group partimag >/dev/null || groupadd -r partimag
+getent passwd partimag >/dev/null || \
+/usr/sbin/useradd -r -g partimag -d %{image_place} -s /sbin/nologin \
+-c "Partition imaging utility" partimag
+exit 0
 
 %post server
 if [ $1 -eq 1 ]; then
@@ -181,23 +182,20 @@ fi
 if [ "$1" -ge "1" ]; then
         /sbin/service partimaged condrestart &>/dev/null || :
 fi
-if [ $1 -eq 0 ] ; then
-        /usr/sbin/userdel partimag >/dev/null 2>&1 || :
-fi
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS BOOT* BUGS ChangeLog COPYING FUTURE README* THANKS TODO
+%doc AUTHORS BUGS ChangeLog COPYING FORMAT README* THANKS
 %{_sbindir}/partimage
 %{_mandir}/man1/partimage.1*
 %exclude %{_docdir}/partimage
 
 %files server
 %defattr(-, root, root, 0755)
-%doc AUTHORS BOOT* BUGS ChangeLog COPYING FUTURE README* THANKS TODO
+%doc AUTHORS BUGS ChangeLog COPYING FORMAT README* THANKS
 %{_initrddir}/partimaged
 %config(noreplace) %{_sysconfdir}/logrotate.d/partimaged
 %config(noreplace) %{_sysconfdir}/sysconfig/partimaged
@@ -207,7 +205,6 @@ fi
 %{_datadir}/partimaged/partimaged-passwd
 %{_mandir}/man8/partimaged-passwd.8*
 %endif
-%{_sysconfdir}/partimaged/partimage-certs.cnf
 %{_datadir}/partimaged/create_certificates.sh
 %{_mandir}/man8/partimaged.8*
 %{_mandir}/man5/partimagedusers.5*
@@ -220,6 +217,12 @@ fi
 %dir %{image_place}
 
 %changelog
+* Sun Dec 05 2010 Paulo Roma <roma at lcg.ufrj.br> - 0.6.9-1
+- Updated to 0.6.9.
+- Fixed user creation.
+- Removed gcc4 patch.
+- No more deleting partimag user upon package removal.
+
 * Thu Nov 26 2009 Paulo Roma <roma at lcg.ufrj.br> - 0.6.8-2
 - Patched for gcc44 (Fedora 12).
 
diff --git a/sources b/sources
index 8e72eb8..764042b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+1bc046fd915c5debbafc85729464e513  partimage-0.6.9.tar.bz2
 2ca176278ca1dbe52d74f70812a693ab  partimage-man.tar.gz
 77e47a3cdd7d804ab7efae19143b23ec  partimage-scripts.tar.gz
-c13c8ede8cdf7745b97ec5827920ece7  partimage-0.6.8.tar.bz2