packages: pam-pam_mount/pam-pam_mount.spec - updated to 2.13 - pass slibdir...

[adamg]

Author: adamg                        Date: Sun Feb 12 12:29:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.13
- pass slibdir
- separate libcryptmount library
- adapterized

---- Files affected:
packages/pam-pam_mount:
   pam-pam_mount.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/pam-pam_mount/pam-pam_mount.spec
diff -u packages/pam-pam_mount/pam-pam_mount.spec:1.66 packages/pam-pam_mount/pam-pam_mount.spec:1.67
--- packages/pam-pam_mount/pam-pam_mount.spec:1.66	Sun Feb 12 09:20:03 2012
+++ packages/pam-pam_mount/pam-pam_mount.spec	Sun Feb 12 13:29:40 2012
@@ -7,12 +7,12 @@
 Summary:	A PAM module that can mount remote volumes for a user session
 Summary(pl.UTF-8):	Moduł PAM, pozwalający montować zdalne zasoby na czas sesji użytkownika
 Name:		pam-%{modulename}
-Version:	2.12
-Release:	5
+Version:	2.13
+Release:	1
 License:	LGPL
 Group:		Base
 Source0:	http://downloads.sourceforge.net/pam-mount/%{modulename}-%{version}.tar.xz
-# Source0-md5:	5a4e5e2df01a239d410925e38c133dd5
+# Source0-md5:	9f75fc8e84ea9cde619cdd6a62c7de33
 Source1:	%{name}.tmpfiles
 URL:		http://pam-mount.sourceforge.net/
 BuildRequires:	autoconf
@@ -20,6 +20,7 @@
 BuildRequires:	cryptsetup-luks-devel >= 1.1.2
 BuildRequires:	glib2-devel
 BuildRequires:	libHX-devel >= 3.6
+BuildRequires:	libmount-devel >= 2.20
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel >= 0.9.8
@@ -76,6 +77,29 @@
 pam_mount "rozumie" SMB, NCP oraz zaszyfrowane systemy plików po
 loopbacku, ale może być rozszerzony w prosty sposób.
 
+%package -n libcryptmount
+Summary:	libcryptmount library
+Summary(pl.UTF-8):	Biblioteka libcryptmount
+Group:		Libraries
+
+%description -n libcryptmount
+libcryptmount library.
+
+%description -n libcryptmount -l pl.UTF-8
+Biblioteka libcryptmount
+
+%package -n libcryptmount-devel
+Summary:	Header files for libcryptmount library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libcryptmount
+Group:		Development/Libraries
+Requires:	libcryptmount = %{version}-%{release}
+
+%description -n libcryptmount-devel
+Header files for libcryptmount library.
+
+%description -n libcryptmount-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libcryptmount.
+
 %prep
 %setup -q -n %{modulename}-%{version}
 
@@ -86,29 +110,32 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-slibdir=/%{_lib} \
 	--disable-static
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/security,/sbin,/var/run/pam_mount,%{_bindir}} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install \
+%{__make} -j1 install \
 	moduledir=/%{_lib}/security \
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -a config/pam_mount.conf.xml $RPM_BUILD_ROOT/etc/security
 ln -sf /sbin/mount.crypt $RPM_BUILD_ROOT%{_bindir}/mount.crypt
 
-install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/pam_mount.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/pam_mount.conf
 
-# void code on non-OpenBSD, besides broken
-#rm $RPM_BUILD_ROOT{%{_bindir}/mount_ehd,%{_mandir}/man8/mount_ehd.8}
+rm $RPM_BUILD_ROOT%{_libdir}/libcryptmount.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -n libcryptmount -p /sbin/ldconfig
+%postun -n libcryptmount -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/security/pam_mount.so
@@ -123,7 +150,7 @@
 %attr(755,root,root) %{_sbindir}/pmt-ehd
 %attr(755,root,root) %{_sbindir}/pmvarrun
 %dir /var/run/pam_mount
-/usr/lib/tmpfiles.d/pam_mount.conf
+%{systemdtmpfilesdir}/pam_mount.conf
 %{_mandir}/man5/pam_mount.conf.5*
 %{_mandir}/man8/mount.crypt.8*
 %{_mandir}/man8/mount.crypt_LUKS.8*
@@ -135,12 +162,29 @@
 %{_mandir}/man8/umount.crypt_LUKS.8*
 %{_mandir}/man8/umount.crypto_LUKS.8*
 
+%files -n libcryptmount
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcryptmount.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcryptmount.so.0
+
+%files -n libcryptmount-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcryptmount.so
+%{_includedir}/libcryptmount.h
+%{_pkgconfigdir}/libcryptmount.pc
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2012/02/12 12:29:40  adamg
+- updated to 2.13
+- pass slibdir
+- separate libcryptmount library
+- adapterized
+
 Revision 1.66  2012/02/12 08:20:03  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pam-pam_mount/pam-pam_mount.spec?r1=1.66&r2=1.67&f=u