Tue Jan 12 23:57:26 UTC 2010

Author: rrelyea

Update of /cvs/extras/rpms/pam_pkcs11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9499/devel

Modified Files:
	.cvsignore pam_pkcs11.spec sources 
Added Files:
	import.log 
Removed Files:
	pam_pkcs11-0.5.3-cardonly.patch 
	pam_pkcs11-0.5.3-eventmgr-crash-fix.patch 
	pam_pkcs11-0.5.3-export-auth-cert.patch 
	pam_pkcs11-0.5.3-l10n.patch pam_pkcs11-0.5.3-nss.patch 
	pam_pkcs11-0.5.3-ocsp.patch pam_pkcs11-0.5.3-pam-syslog.patch 
	pam_pkcs11-0.5.3-password.patch pam_pkcs11-0.5.3-pin-fix.patch 
	pam_pkcs11-0.5.3-putenv-login-token.patch 
	pam_pkcs11-0.5.3-reject_unloaded_module.patch 
	pam_pkcs11-0.5.3-screen-saver.patch 
	pam_pkcs11-0.5.3-setup-tool.patch 
	pam_pkcs11-0.5.3-wait-for-card.patch 
Log Message:


Move to latest upstream version. Drop all the previous patches which are already upsteam.

--- NEW FILE import.log ---
pam_pkcs11-0_6_2-1:HEAD:pam_pkcs11-0.6.2-1.src.rpm:1263340474


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Jul 2006 21:48:16 -0000	1.2
+++ .cvsignore	12 Jan 2010 23:57:19 -0000	1.3
@@ -1 +1 @@
-pam_pkcs11-0.5.3.tar.gz
+pam_pkcs11-0.6.2.tar.gz


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- pam_pkcs11.spec	25 Jul 2009 23:11:19 -0000	1.32
+++ pam_pkcs11.spec	12 Jan 2010 23:57:25 -0000	1.33
@@ -1,34 +1,20 @@
-%define nss_version 3.10
-%define nspr_version 4.6
-%define with_curl	0
-%define with_ldap	0
+%global nss_version 3.10
+%global nspr_version 4.6
+%global with_curl	0
+%global with_ldap	0
 
 
 Name:           pam_pkcs11
-Version:        0.5.3
-Release:        29
+Version:        0.6.2
+Release:        1
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
 License:        LGPLv2+
-URL:            http://www.opensc.org/pam_pkcs11
-Source0: 	http://www.opensc.org/files/%{name}-%{version}.tar.gz
+URL:            http://www.opensc-project.org/pam_pkcs11
+Source0: 	http://www.opensc-project.org/files/pam_pkcs11/%{name}-%{version}.tar.gz
 Source1:	rh_pam_pkcs11.conf
 Source2:	rh_pkcs11_eventmgr.conf
-Patch1:		pam_pkcs11-0.5.3-nss.patch
-Patch2:		pam_pkcs11-0.5.3-cardonly.patch
-Patch3:		pam_pkcs11-0.5.3-setup-tool.patch
-Patch4:		pam_pkcs11-0.5.3-putenv-login-token.patch
-Patch5:		pam_pkcs11-0.5.3-ocsp.patch
-Patch6:		pam_pkcs11-0.5.3-wait-for-card.patch
-Patch7:		pam_pkcs11-0.5.3-reject_unloaded_module.patch
-Patch8:		pam_pkcs11-0.5.3-l10n.patch
-Patch9:		pam_pkcs11-0.5.3-screen-saver.patch
-Patch10:	pam_pkcs11-0.5.3-pin-fix.patch
-Patch11:	pam_pkcs11-0.5.3-eventmgr-crash-fix.patch
-Patch12:	pam_pkcs11-0.5.3-pam-syslog.patch
-Patch13:	pam_pkcs11-0.5.3-password.patch
-Patch14:	pam_pkcs11-0.5.3-export-auth-cert.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -41,8 +27,6 @@ BuildRequires: nspr-devel
 BuildRequires: pkgconfig
 BuildRequires: intltool
 BuildRequires: gettext
-Requires:	nss >= %{nss_version}
-Requires:	nspr >= %{nspr_version}
 Provides:       pam_pkcs11 = %{version}-%{release}
 
 %description
@@ -60,33 +44,19 @@ Additional included pam_pkcs11 related t
 
 %prep
 %setup -q -n pam_pkcs11-%{version}
-%patch1 -p0 -b .nss
-%patch2 -p0 -b .card-only
-%patch3 -p1 -b .setup
-%patch4 -p0 -b .putenv
-%patch5 -p0 -b .ocsp
-%patch6 -p1 -b .wait-for-card
-%patch7 -p0 -b .reject-unloaded-module
-%patch8 -p0 -b .l10n
-%patch9 -p0 -b .screen-saver
-%patch10 -p0 -b .pin-fix
-%patch11 -p0 -b .eventmgr-crash-fix
-%patch12 -p1 -b .pam-syslog
-%patch13 -p1 -b .password
-%patch14 -p0 -b .export-auth-cert
 
 %build
 
 %if %{with_curl}
-%define curl_flags --with-curl=yes
+%global curl_flags --with-curl=yes
 %else
-%define curl_flags --with-curl=no
+%global curl_flags --with-curl=no
 %endif
 
 %if %{with_ldap}
-%define ldap_flags --with-ldap=yes
+%global ldap_flags --with-ldap=yes
 %else
-%define ldap_flags --with-ldap=no
+%global ldap_flags --with-ldap=no
 %endif
 %configure  \
     --with-nss \
@@ -115,22 +85,30 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROO
 # clean up those files that aren't part of this package
 # (makefile should install them if --without-pcsclite is supplied
 #
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/card_eventmgr.1
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/card_eventmgr.conf.example
+#rm -f $RPM_BUILD_ROOT/%{_bindir}/card_eventmgr
+#rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/card_eventmgr.1
+#rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}/card_eventmgr.conf.example
 
 # nss version does not need this script
 rm -f $RPM_BUILD_ROOT/%{_bindir}/make_hash_link.sh
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pkcs11_make_hash_link.1
+
+# package the examples in the doc directory directly.
+rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO ChangeLog NEWS 
 %doc doc/pam_pkcs11.html
 %doc doc/mappers_api.html
 %doc doc/README.autologin
 %doc doc/README.mappers
+%doc etc/*.example
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}/pkcs11_eventmgr.conf
@@ -138,22 +116,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pklogin_finder
 %{_bindir}/pkcs11_inspect
 %{_bindir}/pkcs11_setup
+%{_bindir}/card_eventmgr
+%{_bindir}/pkcs11_listcerts
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
 /%{_lib}/security/%{name}.so
 %{_mandir}/man8/%{name}.8.gz
 %{_mandir}/man1/pkcs11_eventmgr.1.gz
 %{_mandir}/man1/pkcs11_inspect.1.gz
+%{_mandir}/man1/pkcs11_listcerts.1.gz
+%{_mandir}/man1/pkcs11_setup.1.gz
 %{_mandir}/man1/pklogin_finder.1.gz
-%dir %{_datadir}/%{name}
-%doc %{_datadir}/%{name}/%{name}.conf.example
-%doc %{_datadir}/%{name}/pam.d_login.example
-%doc %{_datadir}/%{name}/subject_mapping.example
-%doc %{_datadir}/%{name}/mail_mapping.example
-%doc %{_datadir}/%{name}/digest_mapping.example
-%doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
+%{_mandir}/man1/card_eventmgr.1.gz
 
 %changelog
+* Wed Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-1
+- Pick up the latest pam_pkcs11 from upstream
+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Jul 2006 21:48:16 -0000	1.2
+++ sources	12 Jan 2010 23:57:25 -0000	1.3
@@ -1 +1 @@
-607e3ba84b8938eff20c51c597e522c0  pam_pkcs11-0.5.3.tar.gz
+68d99525709798b43c8a691e328a5f0a  pam_pkcs11-0.6.2.tar.gz


--- pam_pkcs11-0.5.3-cardonly.patch DELETED ---


--- pam_pkcs11-0.5.3-eventmgr-crash-fix.patch DELETED ---


--- pam_pkcs11-0.5.3-export-auth-cert.patch DELETED ---


--- pam_pkcs11-0.5.3-l10n.patch DELETED ---


--- pam_pkcs11-0.5.3-nss.patch DELETED ---


--- pam_pkcs11-0.5.3-ocsp.patch DELETED ---


--- pam_pkcs11-0.5.3-pam-syslog.patch DELETED ---


--- pam_pkcs11-0.5.3-password.patch DELETED ---


--- pam_pkcs11-0.5.3-pin-fix.patch DELETED ---


--- pam_pkcs11-0.5.3-putenv-login-token.patch DELETED ---


--- pam_pkcs11-0.5.3-reject_unloaded_module.patch DELETED ---


--- pam_pkcs11-0.5.3-screen-saver.patch DELETED ---


--- pam_pkcs11-0.5.3-setup-tool.patch DELETED ---


--- pam_pkcs11-0.5.3-wait-for-card.patch DELETED ---

