packages: libchipcard/libchipcard.spec - removed obsoleted bconds (hal and ...

[wiget]

Author: wiget                        Date: Thu Mar  3 19:34:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed obsoleted bconds (hal and sysfsutils not used anymore)
- use %{__rm} macro
- drop libtool file

---- Files affected:
packages/libchipcard:
   libchipcard.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/libchipcard/libchipcard.spec
diff -u packages/libchipcard/libchipcard.spec:1.21 packages/libchipcard/libchipcard.spec:1.22
--- packages/libchipcard/libchipcard.spec:1.21	Mon Jan 24 03:05:45 2011
+++ packages/libchipcard/libchipcard.spec	Thu Mar  3 20:34:17 2011
@@ -2,15 +2,11 @@
 # TODO:
 # - revise split (e.g. which data should go to -tools)
 #
-# Conditional build:
-%bcond_without	sysfs	# don't use sysfs to scan for ttyUSB
-%bcond_without	hal	# don't use hal
-#
 Summary:	A library for easy access to smart cards (chipcards)
 Summary(pl.UTF-8):	Biblioteka łatwego dostępu do kart procesorowych
 Name:		libchipcard
 Version:	5.0.0
-Release:	4
+Release:	5
 License:	LGPL v2.1 with OpenSSL linking exception
 Group:		Libraries
 # http://www2.aquamaniac.de/sites/download/packages.php
@@ -26,13 +22,6 @@
 BuildRequires:	pcsc-lite-devel >= 1.6.2
 BuildRequires:	pkgconfig
 BuildRequires:	which
-%if %{with hal}
-BuildRequires:	hal-devel >= 0.5.0
-%else
-%if %{with sysfs}
-BuildRequires:	sysfsutils-devel >= 1.3.0-3
-%endif
-%endif
 Obsoletes:	libchipcard-static
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,13 +48,6 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gwenhywfar-devel >= 3.0.0
-%if %{with hal}
-Requires:	hal-devel >= 0.5.0
-%else
-%if %{with sysfs}
-Requires:	sysfsutils-devel >= 1.3.0-3
-%endif
-%endif
 
 %description devel
 This package contains libchipcard-config and header files for writing
@@ -106,8 +88,7 @@
 %{__automake}
 %configure \
 	--disable-static \
-	--with-pcsc-libs=%{_libdir} \
-	%{!?with_sysfs:ac_cv_header_sysfs_libsysfs_h=no}
+	--with-pcsc-libs=%{_libdir}
 
 %{__make}
 
@@ -118,9 +99,10 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	initscriptdir=/etc/rc.d/init.d
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gwenhywfar/plugins/*/ct/*.la
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/chipcard/chipcardc.conf{.default,}
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/chipcard/chipcardc.conf.example
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gwenhywfar/plugins/*/ct/*.la \
+	$RPM_BUILD_ROOT%{_sysconfdir}/chipcard/chipcardc.conf.example \
+	$RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,7 +136,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/chipcard-config
 %attr(755,root,root) %{_libdir}/libchipcard.so
-%{_libdir}/libchipcard.la
 %{_includedir}/libchipcard5
 %{_aclocaldir}/chipcard.m4
 
@@ -172,6 +153,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/03/03 19:34:17  wiget
+- removed obsoleted bconds (hal and sysfsutils not used anymore)
+- use %{__rm} macro
+- drop libtool file
+
 Revision 1.21  2011/01/24 02:05:45  sparky
 - BR: which
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libchipcard/libchipcard.spec?r1=1.21&r2=1.22&f=u