Author: qboosh Date: Mon Mar 6 09:41:06 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: SPECS: pcsc-lite.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/pcsc-lite.spec diff -u SPECS/pcsc-lite.spec:1.22 SPECS/pcsc-lite.spec:1.23 --- SPECS/pcsc-lite.spec:1.22 Tue Dec 13 15:37:23 2005 +++ SPECS/pcsc-lite.spec Mon Mar 6 10:41:01 2006 @@ -2,28 +2,30 @@ Summary: Muscle PCSC Framework for Linux Summary(pl): Środowisko PCSC dla Linuksa Name: pcsc-lite -Version: 1.2.0 -Release: 2 +Version: 1.3.0 +Release: 1 License: BSD Group: Daemons #Source0Download: http://alioth.debian.org/project/showfiles.php?group_id=30105 -Source0: http://alioth.debian.org/download.php/419/%{name}-%{version}.tar.gz -# Source0-md5: 98456d274b2f4bfe74c5ab59070f8d50 +Source0: http://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz +# Source0-md5: ccbb595be0e1d47c9f9f449f183bea6c Source1: %{name}-pcscd.init Source2: %{name}-pcscd.sysconfig Patch0: %{name}-fhs.patch +Patch1: %{name}-any.patch URL: http://www.linuxnet.com/middle.html BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: flex BuildRequires: libtool >= 1.4.2-9 BuildRequires: libusb-devel +Requires(pre): fileutils Requires(post,preun): /sbin/chkconfig Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define muscledropdir /usr/%{_lib}/pcsc/services %define usbdropdir /usr/%{_lib}/pcsc/drivers +%define muscledropdir /usr/%{_lib}/pcsc/services %description pcscd is the daemon program for PC/SC Lite. It is a resource manager @@ -55,7 +57,7 @@ %package devel Summary: PC/SC Lite development files Summary(pl): Pliki dla programistów używających PC/SC Lite -Group: Development/Tools +Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel @@ -67,7 +69,7 @@ %package static Summary: Static PC/SC Lite libraries Summary(pl): Biblioteki statyczne PC/SC Lite -Group: Development/Tools +Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static @@ -79,10 +81,11 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} -%{__aclocal} -I aclocal +%{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} @@ -95,24 +98,30 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{muscledropdir},%{usbdropdir}} \ +install -d $RPM_BUILD_ROOT{%{usbdropdir},%{muscledropdir}} \ $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# useful for drivers development -install src/ifdhandler.h $RPM_BUILD_ROOT%{_includedir} - install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pcscd install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pcscd install doc/example/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +:> $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf + %clean rm -rf $RPM_BUILD_ROOT +%pre +# upgrade from pcsc-lite < 1.2.9-0.beta7 +if [ -f /etc/reader.conf -a ! -f /etc/reader.conf.d/reader.conf ]; then + install -d -m755 /etc/reader.conf.d + cp -af /etc/reader.conf /etc/reader.conf.d/reader.conf +fi + %post /sbin/chkconfig --add pcscd if [ -f /var/lock/subsys/pcscd ]; then @@ -135,34 +144,36 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING ChangeLog* DRIVERS HELP NEWS README SECURITY doc/README.DAEMON -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/reader.conf -%attr(754,root,root) /etc/rc.d/init.d/pcscd -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd -%attr(755,root,root) %{_sbindir}/pcscd -%attr(755,root,root) %{_bindir}/bundleTool %attr(755,root,root) %{_bindir}/formaticc -%attr(755,root,root) %{_bindir}/installifd +%attr(755,root,root) %{_sbindir}/installifd +%attr(755,root,root) %{_sbindir}/pcscd +%attr(755,root,root) %{_sbindir}/update-reader.conf %{_libdir}/pcsc +%dir %{_sysconfdir}/reader.conf.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/reader.conf.d/reader.conf +%ghost %{_sysconfdir}/reader.conf +%attr(754,root,root) /etc/rc.d/init.d/pcscd +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd %{_mandir}/man1/formaticc.1* -%{_mandir}/man8/bundleTool.8* +%{_mandir}/man5/reader.conf.5* %{_mandir}/man8/pcscd.8* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%attr(755,root,root) %{_libdir}/libpcsclite.so.*.*.* %files devel %defattr(644,root,root,755) %doc doc/*.pdf -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la -%{_includedir}/*.h -%{_pkgconfigdir}/*.pc +%attr(755,root,root) %{_libdir}/libpcsclite.so +%{_libdir}/libpcsclite.la +%{_includedir}/PCSC +%{_pkgconfigdir}/libpcsclite.pc %{_examplesdir}/%{name}-%{version} %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libpcsclite.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -170,11 +181,42 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2006/03/06 09:41:01 qboosh +- merged from DEVEL + Revision 1.22 2005/12/13 14:37:23 glen - adapterized (sorted %verify flags) Revision 1.21 2004/08/23 08:46:58 qboosh - updated download URL + +Revision 1.20.2.9 2006/03/06 09:39:27 qboosh +- updated to 1.3.0 release, libmusclecard separated again + +Revision 1.20.2.8 2006/02/06 09:18:31 qboosh +- updated to 1.2.9-beta10 + +Revision 1.20.2.7 2005/11/28 09:51:21 qboosh +- updated to 1.2.9-beta9 + +Revision 1.20.2.6 2005/09/20 08:33:07 qboosh +- updated to 1.2.9-beta8; libmusclecard is here again (but in subpackages) + +Revision 1.20.2.5 2005/03/04 11:14:49 qboosh +- updated to 1.2.9-beta7, updated any patch and .init +- libmusclecard has been moved to separate package + +Revision 1.20.2.4 2004/08/24 12:54:18 qboosh +- added any patch, release .2 + +Revision 1.20.2.3 2004/08/23 08:46:30 qboosh +- updated download URL + +Revision 1.20.2.2 2004/08/20 12:00:43 qboosh +- 1.2.9-beta6 + +Revision 1.20.2.1 2004/08/02 10:32:16 qboosh +- updated to 1.2.9-beta5, updated fhs patch Revision 1.20 2004/07/30 14:49:12 qboosh - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pcsc-lite.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
