rpms/openct/devel .cvsignore, 1.4, 1.5 openct.spec, 1.9, 1.10 sources, 1.4, 1.5 openct-0.6.6-rpath64.patch, 1.1, NONE openct-reader.conf, 1.1, NONE openct.rules, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore openct.spec sources 
Removed Files:
	openct-0.6.6-rpath64.patch openct-reader.conf openct.rules 
Log Message:
* 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Sep 2005 07:06:13 -0000	1.4
+++ .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-openct-0.6.6.tar.gz
+openct-0.6.7-rc1.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openct.spec	6 Mar 2006 15:50:50 -0000	1.9
+++ openct.spec	22 Apr 2006 20:35:04 -0000	1.10
@@ -1,25 +1,22 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.6
-Release:        5%{?dist}
+Version:        0.6.7
+Release:        0.1.rc1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/%{name}-%{version}.tar.gz
+License:        LGPL
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Source3:        %{name}-reader.conf
-Source4:        %{name}.rules
-Patch0:         %{name}-0.6.6-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  sed
+BuildRequires:  libtool
 # TODO: verify minimum udev version
 Requires:       udev >= 062
 Requires(post): /sbin/chkconfig
@@ -56,17 +53,14 @@
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't appear to do its job
-%patch0 -p1
-sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
+%setup -q -n %{name}-%{version}-rc1
+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
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --disable-static \
-  --with-bundle-dir=%{dropdir}
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
 
@@ -74,16 +68,20 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -Dpm 644 \
-  %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+install -dm 755 $RPM_BUILD_ROOT%{dropdir}
+mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
 
-ln -sf %{_libdir}/openct-ifd.so \
-  $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/
+install -Dpm 644 etc/openct.udev \
+  $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
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
+
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
-install -Dpm 644 %{name}-reader.conf \
+
+install -Dpm 644 etc/reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
@@ -124,7 +122,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE NEWS TODO doc/*.html doc/*.css
+%doc NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -135,6 +133,7 @@
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
 %{_libdir}/libopenctapi.so
+%{_libdir}/openct/
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
 %{_mandir}/man1/openct-tool.1*
@@ -149,11 +148,13 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{_libdir}/openct-ifd.so
-%{dropdir}/openct-ifd.bundle/
+%{dropdir}/openct-ifd.so
 
 
 %changelog
+* 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.
+
 * Mon Mar  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-5
 - Rebuild with new pcsc-lite.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2005 07:06:13 -0000	1.4
+++ sources	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz
+8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz


--- openct-0.6.6-rpath64.patch DELETED ---


--- openct-reader.conf DELETED ---


--- openct.rules DELETED ---