devel/opensc opensc-lvalue.patch,NONE,1.1 opensc.spec,1.4,1.5
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Fri Mar 18 09:23:20 UTC 2005
Author: scop
Update of /cvs/extras/devel/opensc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21693
Modified Files:
opensc.spec
Added Files:
opensc-lvalue.patch
Log Message:
Fix FC4 build, opensc-pam -> pam_opensc.
opensc-lvalue.patch:
--- NEW FILE opensc-lvalue.patch ---
Index: src/pam/pam_support.c
===================================================================
--- src/pam/pam_support.c (revision 2139)
+++ src/pam/pam_support.c (revision 2140)
@@ -205,7 +205,8 @@
static void _cleanup(pam_handle_t * pamh, void *x, int error_status)
{
- _pam_delete((char *) x);
+ char *y = (char *) x;
+ _pam_delete(y);
}
/* ************************************************************** *
Index: opensc.spec
===================================================================
RCS file: /cvs/extras/devel/opensc/opensc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opensc.spec 5 Mar 2005 21:10:23 -0000 1.4
+++ opensc.spec 18 Mar 2005 09:23:18 -0000 1.5
@@ -6,7 +6,7 @@
Name: opensc
Version: 0.9.4
-Release: 2
+Release: 3
Summary: OpenSC SmartCard library and applications
Group: System Environment/Libraries
@@ -14,6 +14,7 @@
URL: http://www.opensc.org/
Source0: http://www.opensc.org/files/opensc-0.9.4.tar.gz
Patch0: %{name}-build.patch
+Patch1: %{name}-lvalue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
@@ -41,20 +42,21 @@
plugins that will generate digital signatures using facilities on
PKI-capable smartcards.
-%package pam
+%package -n pam_%{name}
Summary: OpenSC pluggable authentication module
Group: System Environment/Base
-Provides: pam_opensc = %{version}-%{release}
+Provides: %{name}-pam = %{version}-%{release}
+Obsoletes: %{name}-pam < 0.9.4-3
Requires: %{name} = %{version}-%{release}
-%description pam
+%description -n pam_%{name}
OpenSC pluggable authentication module implementing smart card support.
%package devel
Summary: OpenSC development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} pkgconfig
-Requires: %{name}-pam = %{version}-%{release}
+Requires: pam_%{name} = %{version}-%{release}
%description devel
OpenSC development files.
@@ -63,6 +65,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p0
cp -p src/pkcs15init/README ./README.pkcs15init
cp -p src/scconf/README.scconf .
for file in docs/*.1 ; do
@@ -105,9 +108,9 @@
%post -p /sbin/ldconfig
-%post pam -p /sbin/ldconfig
+%post -n pam_%{name} -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%postun pam -p /sbin/ldconfig
+%postun -n pam_%{name} -p /sbin/ldconfig
%files
@@ -147,7 +150,7 @@
%{plugindir}/opensc-signer.so
%{_libdir}/opensc/opensc-signer.so
-%files pam
+%files -n pam_%{name}
%defattr(-,root,root,-)
%doc PAM_README
/%{_lib}/security/pam_opensc.so
@@ -179,6 +182,10 @@
%changelog
+* Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.4-3
+- Fix FC4 build.
+- Rename opensc-pam to pam_opensc per package naming guidelines.
+
* Wed Feb 9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.4-2
- Substitute hardcoded 'lib' in OpenSSL checks for multi-lib platforms.
- Use --with-plugin-dir instead of --with-plugin-path (fixes x86_64).
More information about the fedora-extras-commits
mailing list