rpms/pam_mount/devel .cvsignore, 1.9, 1.10 pam_mount.spec, 1.25, 1.26 sources, 1.10, 1.11 pam_mount-README.Fedora, 1.1, NONE pam_mount-lsof-path.patch, 1.1, NONE pam_mount-umount.crypt-wait.patch, 1.1, NONE

[Till Maas (till)]

Author: till

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

Modified Files:
	.cvsignore pam_mount.spec sources 
Removed Files:
	pam_mount-README.Fedora pam_mount-lsof-path.patch 
	pam_mount-umount.crypt-wait.patch 
Log Message:
update to new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Dec 2006 19:37:41 -0000	1.9
+++ .cvsignore	10 Oct 2007 15:26:42 -0000	1.10
@@ -1 +1 @@
-pam_mount-0.18.tar.bz2
+pam_mount-0.29.tar.bz2


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pam_mount.spec	23 Aug 2007 12:58:22 -0000	1.25
+++ pam_mount.spec	10 Oct 2007 15:26:42 -0000	1.26
@@ -1,23 +1,25 @@
 Name:           pam_mount
-Version:        0.18
-Release:        2%{?dist}
+Version:        0.29
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
 # The library and binary are LGPLv2+, the scripts are GPLv2+
 License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
-Source1:        %name-README.Fedora
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
 
-Patch1:         %{name}-lsof-path.patch
-Patch2:         pam_mount-umount.crypt-wait.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libHX-devel
 Requires:       pam, lsof
 Requires:       psmisc
+Requires:       perl-XML-Writer
+Requires(pre):  perl-XML-Writer
+
 
 %description
 This module is aimed at environments with SMB (Samba or Windows NT) 
@@ -56,61 +58,59 @@
 %prep
 %setup -q
 
-%patch1 -p1
-
-#cp %SOURCE1 README.Fedora
 
 %build
-%configure --libdir=/%{_lib}
-
-make %{?_smp_mflags} moduledir=/%{_lib}/security
+%configure --with-slibdir=/%{_lib} --with-selinux
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
+mkdir %{buildroot}
+make install DESTDIR=%{buildroot}
 
-make install \
-	moduledir=/%{_lib}/security \
-	DESTDIR=%{buildroot}
-
-mkdir -p %{buildroot}/%{_sysconfdir}/security
-mkdir -p %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/macros
-mkdir -p %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-install -p --mode=0644 config/pam_mount.conf %{buildroot}/%{_sysconfdir}/security
-install -p --mode=0644 config/pam_mount_macros.te %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/macros
-install -p --mode=0644 config/pam_mount.fc %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-
+install -p scripts/convert_pam_mount_conf.pl %{buildroot}/%{_bindir}
 rm -f %{buildroot}/%{_lib}/security/*.{a,la}
 
+
+%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;
+fi
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS FAQ README TODO
-# README.Fedora (for 0.19)
-%doc LICENSE.GPL2 
-#LICENSE.GPL3
-%doc LICENSE.LGPL2 
-#LICENSE.LGPL3
+%doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
+%doc LICENSE.GPL2 LICENSE.GPL3
+%doc LICENSE.LGPL2 LICENSE.LGPL3
 /%{_lib}/security/pam_mount.so
-/%{_lib}/security/pam_mount_auth.so
-/%{_lib}/security/pam_mount_session.so
 %{_sbindir}/pmvarrun
-%{_bindir}/mkehd
 %{_bindir}/autoehd
-%{_bindir}/passwdehd
+%{_bindir}/convert_pam_mount_conf.pl
+%{_bindir}/mkehd
 %{_bindir}/mount_ehd
+%{_bindir}/passwdehd
 /sbin/mount.crypt
 /sbin/umount.crypt
 %{_mandir}/man?/*
-%config(noreplace) %{_sysconfdir}/security/pam_mount.conf
+%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
 %policy %{_sysconfdir}/selinux/strict/src/policy/macros/pam_mount_macros.te
 %policy %{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc/pam_mount.fc
 
 
 %changelog
+* Wed Oct 10 2007 Till Maas <opensource till name> - 0.29-1
+- bump to new version
+- remove uneeded patches
+- add config file conversion script and convert config in %%post
+
 * Thu Aug 23 2007 Till Maas <opensource till name> - 0.18-2
 - add README.Fedora
 - add patch to wait for applications that do not process pam properly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Dec 2006 19:37:41 -0000	1.10
+++ sources	10 Oct 2007 15:26:42 -0000	1.11
@@ -1 +1 @@
-c2e2a7eee61596a8c72d79d8bba3538d  pam_mount-0.18.tar.bz2
+70be864effaeec1b57b491e91ddb57b0  pam_mount-0.29.tar.bz2


--- pam_mount-README.Fedora DELETED ---


--- pam_mount-lsof-path.patch DELETED ---


--- pam_mount-umount.crypt-wait.patch DELETED ---