rpms/openct/devel openct-0.6.15-nosleep-287871.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 openct.spec, 1.31, 1.32 sources, 1.16, 1.17 openct-0.6.14-nosleep-287871.patch, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28775

Modified Files:
	.cvsignore openct.spec sources 
Added Files:
	openct-0.6.15-nosleep-287871.patch 
Removed Files:
	openct-0.6.14-nosleep-287871.patch 
Log Message:
* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1
- Update to latest upstream


openct-0.6.15-nosleep-287871.patch:

--- NEW FILE openct-0.6.15-nosleep-287871.patch ---
diff -up openct-0.6.15/etc/openct.udev.in.orig openct-0.6.15/etc/openct.udev.in
--- openct-0.6.15/etc/openct.udev.in.orig	2008-07-27 11:54:37.000000000 +0200
+++ openct-0.6.15/etc/openct.udev.in	2008-09-02 11:13:11.000000000 +0200
@@ -17,7 +17,8 @@ ACTION!="add", GOTO="openct_usb_rules_en
 KERNEL=="[0-9]*:*", WAIT_FOR_SYSFS="bInterfaceProtocol"
 
 # sleep for 100ms - the wait_for_sysfs might not be enough
-PROGRAM="/bin/sleep 0.1"
+# Disabled in this package - see https://bugzilla.redhat.com/287871
+#PROGRAM="/bin/sleep 0.1"
 
 # egate
 SYSFS{idVendor}=="0973", SYSFS{idProduct}=="0001", RUN+="@udevdir@/openct_usb"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Aug 2007 19:30:25 -0000	1.16
+++ .cvsignore	2 Sep 2008 12:35:02 -0000	1.17
@@ -1 +1 @@
-openct-0.6.14.tar.gz
+openct-0.6.15.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openct.spec	13 Feb 2008 21:08:56 -0000	1.31
+++ openct.spec	2 Sep 2008 12:35:02 -0000	1.32
@@ -3,8 +3,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.14
-Release:        4%{?dist}
+Version:        0.6.15
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -13,12 +13,13 @@
 Source0:        http://www.opensc-project.org/files/openct/%{name}-%{version}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         %{name}-0.6.14-nosleep-287871.patch
+Patch1:         %{name}-0.6.15-nosleep-287871.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:  doxygen
 Requires:       %{_libdir}/ctapi
 # 098 for some keywords in shipped rules, see etc/openct.udev for more info
 Requires:       udev >= 098
@@ -57,7 +58,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch1 -p1
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
@@ -66,9 +67,13 @@
 # openct uses some gnu extensions
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure \
-    --disable-dependency-tracking \
     --disable-static \
-    --with-bundle-dir=%{dropdir}
+    --enable-usb \
+    --enable-pcsc \
+    --enable-doc \
+    --enable-api-doc \
+    --with-udev=/lib/udev \
+    --with-bundle=%{dropdir}
 make %{?_smp_mflags}
 
 
@@ -100,6 +105,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so}
 
+mkdir apidocdir
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api apidocdir
+mv -T $RPM_BUILD_ROOT%{_datadir}/doc/%{name} docdir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +140,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css
+%doc LGPL-2.1 TODO
+%doc docdir/*
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -152,7 +161,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/api/*
+%doc apidocdir/*
 %{_includedir}/openct/
 %{_libdir}/pkgconfig/libopenct.pc
 %{_libdir}/libopenct.so
@@ -164,6 +173,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1
+- Update to latest upstream
+
 * Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.14-4
 - Fix building with latest glibc
 - Rebuild for gcc-4.3  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Aug 2007 19:30:25 -0000	1.16
+++ sources	2 Sep 2008 12:35:02 -0000	1.17
@@ -1 +1 @@
-04a5c0c7dedcb1ca0d550b1970fbf3b7  openct-0.6.14.tar.gz
+70205beac03974e266fc259b6c9feaa8  openct-0.6.15.tar.gz


--- openct-0.6.14-nosleep-287871.patch DELETED ---