Something went wrong. Reverting again.

OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=38

pcsc-lite.spec

@@ -21,14 +21,9 @@
 Name:           pcsc-lite
 # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do:
 %define ifddir %{_libdir}/readers
-BuildRequires:  pkg-config readline-devel
-%if %suse_version >= 1110
-BuildRequires:  libusb-1_0-devel
-%else
-BuildRequires:  hal-devel
-%endif
-Version:        1.6.6
-Release:        0
+BuildRequires:  hal-devel pkg-config readline-devel
+Version:        1.5.5
+Release:        2
 PreReq:         %{insserv_prereq} %{fillup_prereq}
 Group:          Productivity/Security
 License:        BSD3c(or similar)
@@ -39,8 +34,7 @@ Source1:        %{name}.sysconfig
 Source2:        README.SUSE
 Source3:        pre_checkin.sh
 Source4:        baselibs.conf
-Source5:        pcsc-lite-init
-Source6:        pcsc-lite-reader-conf
+Patch1:         pcsc-lite-init.patch
 Requires:       libpcsclite1 >= %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -125,7 +119,8 @@ Authors:
 
 %prep
 %setup -q
-cp -a %{S:1} %{S:2} %{S:5} %{S:6} .
+cp -a %{S:1} %{S:2} .
+%patch1
 
 %build
 %if %suse_version > 1110
@@ -134,19 +129,17 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
 %configure\
 	--docdir=%{_docdir}/%{name}\
 	--enable-usbdropdir=%{ifddir}\
-%if %suse_version >= 1110
-	--disable-libhal\
-%endif
 	--disable-static
 make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
-sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
+mkdir $RPM_BUILD_ROOT%{ifddir}
 # this program is noinst in the package
 install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/
 mkdir $RPM_BUILD_ROOT/etc/init.d
-install -m 755 pcsc-lite-init $RPM_BUILD_ROOT/etc/init.d/pcscd
+install -m 755 etc/pcscd.init $RPM_BUILD_ROOT/etc/init.d/pcscd
 ln -sf ../../etc/init.d/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd
@@ -177,8 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %doc %{_mandir}/man?/*.*
 %{_sbindir}/*
+%ghost %{_sysconfdir}/reader.conf
 %dir %{_sysconfdir}/reader.conf.d
-%config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf
+%config %{_sysconfdir}/reader.conf.d/reader.conf
 %{ifddir}
 /etc/init.d/pcscd
 /var/adm/fillup-templates/sysconfig.pcscd