rpms/pam_mount/devel .cvsignore, 1.19, 1.20 pam_mount.spec, 1.49, 1.50 sources, 1.20, 1.21 pam_mount-1.4-fsck.patch, 1.1, NONE

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21395

Modified Files:
	.cvsignore pam_mount.spec sources 
Removed Files:
	pam_mount-1.4-fsck.patch 
Log Message:
Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 Nov 2008 14:44:11 -0000	1.19
+++ .cvsignore	28 Jan 2009 08:16:59 -0000	1.20
@@ -1,2 +1,2 @@
-pam_mount-1.4.tar.lz
-pam_mount-1.4.tar.lz.asc
+pam_mount-1.9.tar.bz2
+pam_mount-1.9.tar.bz2.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pam_mount.spec	17 Jan 2009 16:37:12 -0000	1.49
+++ pam_mount.spec	28 Jan 2009 08:16:59 -0000	1.50
@@ -1,6 +1,8 @@
+%define packext bz2
+
 Name:           pam_mount
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -9,18 +11,20 @@
 # mount.encfs13 and pmt-ofl are Public Domain
 License:        LGPLv2+ and (LGPLv2 or LGPLv3) and Public Domain
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lz
-Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lz.asc
-# From upstream scm:
-Patch0:         pam_mount-1.4-fsck.patch
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}
+Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.25
+BuildRequires:  libHX-devel >= 2.2
 BuildRequires:  lzip
 Requires:       pam
-Requires:       libHX >= 1.25
+
+# for /etc/catalog and xmlcatalog
+#Requires:         xml-common
+#Requires(post):   xml-common libxml2
+#Requires(postun): xml-common libxml2
 
 
 %description
@@ -43,13 +47,16 @@
 
 
 %prep
+%if %packext == lz
 %setup -q -T -c
 lzip -c -d %SOURCE0 | tar -xvvf - -C ..
-%patch0 -p1 -b .fsck
+%else
+%setup -q
+%endif
 
 
 %build
-%configure --with-slibdir=/%{_lib}
+%configure --with-slibdir=/%{_lib} --with-dtd
 make %{?_smp_mflags} V=verbose
 
 
@@ -65,6 +72,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+#%post
+#/usr/bin/xmlcatalog --noout --add "rewriteSystem" "http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blob_plain;hb=HEAD;f=config/pam_mount.conf.xml.dtd" file://%{_datadir}/xml/pam_mount/dtds/pam_mount.conf.xml.dtd %{_sysconfdir}/xml/catalog &> /dev/null || :
+
+
+#%postun
+#if [ $1 = 0 ]; then
+#/usr/bin/xmlcatalog --noout --del file://%{_datadir}/xml/pam_mount/dtds/pam_mount.conf.xml.dtd %{_sysconfdir}/catalog
+#fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
@@ -86,9 +103,18 @@
 /sbin/umount.crypto_LUKS
 %{_mandir}/man?/*
 %{_localstatedir}/run/pam_mount
+%dir %{_datadir}/xml/pam_mount/
+%dir %{_datadir}/xml/pam_mount/dtd/
+%{_datadir}/xml/pam_mount/dtd/pam_mount.conf.xml.dtd
 
 
 %changelog
+* Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.9-1
+- Update to new release
+
+* Tue Jan 20 2009 Till Maas <opensource at till.name> - 1.8-1
+- Update to new release
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-2
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	27 Nov 2008 14:44:11 -0000	1.20
+++ sources	28 Jan 2009 08:16:59 -0000	1.21
@@ -1,2 +1,2 @@
-0868825d438d80697ee03d020e5fa90f  pam_mount-1.4.tar.lz
-63fa0f99b2ee011b03528a3be2fef1f0  pam_mount-1.4.tar.lz.asc
+59980ad2f5037e8f56f9410238f6c972  pam_mount-1.9.tar.bz2
+ecd792a06cbef1397433e31729b9032d  pam_mount-1.9.tar.bz2.asc


--- pam_mount-1.4-fsck.patch DELETED ---