rpms/openct/devel .cvsignore, 1.5, 1.6 openct.spec, 1.10, 1.11 sources, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4840

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Apr 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
- 0.6.7-rc4.
- Re-enable PCSC hotplug in pcsc-lite subpackage.
- Include license text.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
+++ .cvsignore	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-openct-0.6.7-rc1.tar.gz
+openct-0.6.7-rc4.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openct.spec	22 Apr 2006 20:35:04 -0000	1.10
+++ openct.spec	26 Apr 2006 14:03:56 -0000	1.11
@@ -2,13 +2,13 @@
 
 Name:           openct
 Version:        0.6.7
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc4%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/
-Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc4.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,14 +53,18 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc4
 sh bootstrap # avoid standard rpaths on lib64 archs
-sed -ie 's|LIBDIR|%{dropdir}|' etc/reader.conf.in
-sed -ie 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' etc/openct.udev
+sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
+sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \
+    etc/openct.udev
 
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure \
+    --disable-dependency-tracking \
+    --disable-static \
+    --with-bundle-dir=%{dropdir}
 make %{?_smp_mflags}
 
 
@@ -68,11 +72,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{dropdir}
-mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
-
 install -Dpm 644 etc/openct.udev \
-  $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
 install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug
 
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
@@ -81,14 +82,16 @@
 
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 
+so=$(find $RPM_BUILD_ROOT%{dropdir} -name \*.so | sed "s|^$RPM_BUILD_ROOT||")
+sed -i -e "s|\\(LIBPATH\\s*\\).*|\\1$so|" etc/reader.conf
 install -Dpm 644 etc/reader.conf \
-  $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+    $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so}
 
 
 %clean
@@ -101,19 +104,19 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/openct stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del openct
+    %{_initrddir}/openct stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del openct
 fi
 
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ] ; then
-  %{_initrddir}/openct try-restart >/dev/null || :
+    %{_initrddir}/openct try-restart >/dev/null || :
 fi
 
 %post -n pcsc-lite-%{name}
 if [ $1 -eq 1 ] ; then
-  %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
+    %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
 fi
 
 %postun -n pcsc-lite-%{name}
@@ -122,7 +125,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc NEWS TODO doc/*.html doc/*.css
+%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -148,10 +151,15 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{dropdir}/openct-ifd.so
+%{dropdir}/openct-ifd.bundle/
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
+- 0.6.7-rc4.
+- Re-enable PCSC hotplug in pcsc-lite subpackage.
+- Include license text.
+
 * Sat Apr 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
 - 0.6.7-rc1, udev rules and reader.conf included upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Apr 2006 20:35:04 -0000	1.5
+++ sources	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz
+261d40f71696a9a2ae168ae09e18f124  openct-0.6.7-rc4.tar.gz