rpms/pam_mount/devel .cvsignore, 1.10, 1.11 pam_mount.spec, 1.28, 1.29 sources, 1.11, 1.12

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3933

Modified Files:
	.cvsignore pam_mount.spec sources 
Log Message:
* Mon Jan 07 2008 Till Maas <opensource till name> - 0.32-1
- update to new version
- add default/example config to %doc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Oct 2007 15:26:42 -0000	1.10
+++ .cvsignore	7 Jan 2008 20:34:54 -0000	1.11
@@ -1 +1 @@
-pam_mount-0.29.tar.bz2
+pam_mount-0.32.tar.bz2


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pam_mount.spec	5 Dec 2007 22:04:58 -0000	1.28
+++ pam_mount.spec	7 Jan 2008 20:34:54 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           pam_mount
-Version:        0.29
-Release:        2%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -17,7 +17,7 @@
 BuildRequires:  libHX-devel
 Requires:       pam, lsof
 Requires:       psmisc
-Requires(pre):  perl(XML::Writer)
+Requires(post):  perl(XML::Writer)
 
 
 %description
@@ -73,12 +73,18 @@
 
 
 %pre
-if [ -e %{_sysconfdir}/security/pam_mount.conf \
-     -a ! -e %{_sysconfdir}/security/pam_mount.conf.xml ]; then
-        convert_pam_mount_conf.pl <%{_sysconfdir}/security/pam_mount.conf \
-                     >%{_sysconfdir}/security/pam_mount.conf.xml;
+if [ $1 -gt 1 ]; then
+   # Upgrade
+   touch -a %{_sysconfdir}/security/pam_mount.conf.xml
 fi
 
+%post
+if [ -e %{_sysconfdir}/security/pam_mount.conf -a \
+     ! -s %{_sysconfdir}/security/pam_mount.conf.xml ]; then
+    convert_pam_mount_conf.pl <%{_sysconfdir}/security/pam_mount.conf \
+                              >%{_sysconfdir}/security/pam_mount.conf.xml;
+fi;
+
 
 %clean
 rm -rf %{buildroot}
@@ -87,6 +93,7 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
+%doc config/pam_mount.conf.xml
 %doc LICENSE.GPL2 LICENSE.GPL3
 %doc LICENSE.LGPL2 LICENSE.LGPL3
 /%{_lib}/security/pam_mount.so
@@ -105,6 +112,10 @@
 
 
 %changelog
+* Mon Jan 07 2008 Till Maas <opensource till name> - 0.32-1
+- update to new version
+- add default/example config to %%doc
+
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.29-2
  - Rebuild for deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Oct 2007 15:26:42 -0000	1.11
+++ sources	7 Jan 2008 20:34:54 -0000	1.12
@@ -1 +1 @@
-70be864effaeec1b57b491e91ddb57b0  pam_mount-0.29.tar.bz2
+a23dcbe28a745173bda68b17931219c9  pam_mount-0.32.tar.bz2