rpms/pcsc-lite/devel pcsc-lite-1.3.0-rpath64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pcsc-lite.spec, 1.7, 1.8 sources, 1.2, 1.3 pcsc-lite-1.2.0-rpath64.patch, 1.1, NONE pcsc-lite-pcscd.init, 1.1, NONE pcsc-lite-update-reader.conf, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Mon Mar 6 15:27:15 UTC 2006


Author: scop

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26529

Modified Files:
	.cvsignore pcsc-lite.spec sources 
Added Files:
	pcsc-lite-1.3.0-rpath64.patch 
Removed Files:
	pcsc-lite-1.2.0-rpath64.patch pcsc-lite-pcscd.init 
	pcsc-lite-update-reader.conf 
Log Message:
* Sun Mar  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.0-1
- 1.3.0, init script and reader.conf updater included upstream.
- Split developer docs into a -doc subpackage, include API docs.
- libmusclecard no longer included, split into separate package upstream.


pcsc-lite-1.3.0-rpath64.patch:

--- NEW FILE pcsc-lite-1.3.0-rpath64.patch ---
--- pcsc-lite-1.3.0/configure~	2006-03-03 15:48:59.000000000 +0200
+++ pcsc-lite-1.3.0/configure	2006-03-05 23:40:48.000000000 +0200
@@ -9103,7 +9103,7 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 if test "$GCC" = yes; then
   sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
   if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -9480,7 +9480,7 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2005 19:57:18 -0000	1.2
+++ .cvsignore	6 Mar 2006 15:27:11 -0000	1.3
@@ -1 +1 @@
-pcsc-lite-1.2.0.tar.gz
+pcsc-lite-1.3.0.tar.gz


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pcsc-lite.spec	13 Feb 2006 22:16:44 -0000	1.7
+++ pcsc-lite.spec	6 Mar 2006 15:27:15 -0000	1.8
@@ -1,21 +1,19 @@
 Name:           pcsc-lite
-Version:        1.2.0
-Release:        14%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
-URL:            http://www.linuxnet.com/middle.html
-Source0:        https://alioth.debian.org/download.php/419/%{name}-%{version}.tar.gz
-Source1:        %{name}-pcscd.init
-Source2:        %{name}-update-reader.conf
+URL:            http://pcsclite.alioth.debian.org/
+Source0:        https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
-Patch1:         %{name}-1.2.0-rpath64.patch
+Patch1:         %{name}-1.3.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}
-BuildRequires:  flex
-BuildRequires:  libusb-devel >= 0.1.6
+BuildRequires:  libusb-devel >= 0.1.7
+BuildRequires:  doxygen
+BuildRequires:  graphviz
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires:       pcsc-ifd-handler
@@ -33,7 +31,6 @@
 Summary:        PC/SC Lite libraries
 Group:          System Environment/Libraries
 Provides:       libpcsc-lite = %{version}-%{release}
-Provides:       libmusclecard = %{version}-%{release}
 
 %description    libs
 PC/SC Lite libraries.
@@ -44,28 +41,23 @@
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
 Provides:       libpcsc-lite-devel = %{version}-%{release}
-Provides:       libmusclecard-devel = %{version}-%{release}
 
 %description    devel
 PC/SC Lite development files.
 
+%package        doc
+Summary:        PC/SC Lite developer documentation
+Group:          Documentation
+
+%description    doc
+%{summary}.
+
 
 %prep
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%{__perl} -pi -e 's|/etc/init\.d\b|%{_initrddir}|' doc/pcscd.8.in
-%{__perl} -pe \
-  's|__LOCALSTATEDIR__|%{_localstatedir}|g ;
-   s|__SYSCONFDIR__|%{_sysconfdir}|g ;
-   s|__INITRDDIR__|%{_initrddir}|g ;
-   s|__SBINDIR__|%{_sbindir}|g' \
-  %{SOURCE1} > pcscd.init
-%{__perl} -pe \
-  's|__SYSCONFDIR__|%{_sysconfdir}| ;
-   s|__INITRDDIR__|%{_initrddir}| ;
-   s|__SBINDIR__|%{_sbindir}|' \
-  %{SOURCE2} > update-reader.conf
+sed -i -e 's/^\(HAVE_DOT\s*=\s*\)/\1 YES/' doc/doxygen.conf.in
 
 
 %build
@@ -75,24 +67,26 @@
   --enable-runpid=%{_localstatedir}/run/pcscd.pid \
   --enable-confdir=%{_sysconfdir} \
   --enable-ipcdir=%{_localstatedir}/run \
-  --enable-muscledropdir=%{_libdir}/pcsc/services \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/{drivers,services}
-install -Dpm 755 pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
-install -pm 644 src/ifdhandler.h $RPM_BUILD_ROOT%{_includedir}/
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
+
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
+
+install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
+
 cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README
 All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
 by %{_sbindir}/update-reader.conf.
 EOF
-install -pm 755 update-reader.conf $RPM_BUILD_ROOT%{_sbindir}/
-rm $RPM_BUILD_ROOT{%{_bindir}/pcsc_demo,%{_libdir}/lib*.la}
+
+rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
 
 
 %clean
@@ -118,32 +112,41 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog* COPYING DRIVERS HELP NEWS README SECURITY
+%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO
 %dir %{_sysconfdir}/reader.conf.d/
 %{_sysconfdir}/reader.conf.d/README
 %ghost %config %{_sysconfdir}/reader.conf
 %{_initrddir}/pcscd
-%{_bindir}/bundleTool
 %{_bindir}/formaticc
-%{_bindir}/installifd
+%{_sbindir}/installifd
 %{_sbindir}/pcscd
 %{_sbindir}/update-reader.conf
 %{_libdir}/pcsc/
-%{_mandir}/man[18]/*.[18]*
+%{_mandir}/man1/formaticc.1*
+%{_mandir}/man5/reader.conf.5*
+%{_mandir}/man8/pcscd.8*
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
+%{_libdir}/libpcsclite.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/*.pdf doc/example/pcsc_demo.c
-%{_includedir}/*.h
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/lib*.pc
+%{_includedir}/PCSC/
+%{_libdir}/libpcsclite.so
+%{_libdir}/pkgconfig/libpcsclite.pc
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/api/ doc/*.pdf doc/example/pcsc_demo.c
 
 
 %changelog
+* Sun Mar  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.0-1
+- 1.3.0, init script and reader.conf updater included upstream.
+- Split developer docs into a -doc subpackage, include API docs.
+- libmusclecard no longer included, split into separate package upstream.
+
 * Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-14
 - Avoid standard rpaths on multilib archs.
 - Fine tune dependencies.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2005 19:57:18 -0000	1.2
+++ sources	6 Mar 2006 15:27:15 -0000	1.3
@@ -1 +1 @@
-98456d274b2f4bfe74c5ab59070f8d50  pcsc-lite-1.2.0.tar.gz
+ccbb595be0e1d47c9f9f449f183bea6c  pcsc-lite-1.3.0.tar.gz


--- pcsc-lite-1.2.0-rpath64.patch DELETED ---


--- pcsc-lite-pcscd.init DELETED ---


--- pcsc-lite-update-reader.conf DELETED ---




More information about the fedora-extras-commits mailing list