Accepting request 70595 from security:chipcard

OBS-URL: https://build.opensuse.org/request/show/70595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcsc-lite?expand=0&rev=31

pcsc-lite.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 18 06:42:02 UTC 2011 - wr@rosenauer.org
+
+- cleanup spec file and requires
+- moved libpcsclite1.so back to devel package
+
 -------------------------------------------------------------------
 Tue May  3 20:15:49 UTC 2011 - wr@rosenauer.org
 

pcsc-lite.spec

@@ -33,7 +33,8 @@ BuildRequires:  hal-devel
 %endif
 Version:        1.7.2
 Release:        2
-PreReq:         %{insserv_prereq} %{fillup_prereq}
+Requires(pre):  pwdutils
+Requires(post): %insserv_prereq %fillup_prereq
 Group:          Productivity/Security
 License:        BSD3c(or similar)
 Url:            http://pcsclite.alioth.debian.org/
@@ -46,7 +47,6 @@ Source4:        baselibs.conf
 Source5:        pcsc-lite-init
 Source6:        pcsc-lite-reader-conf
 Patch0:         disable-power-off.diff
-Requires:       libpcsclite1 >= %{version}
 %if %suse_version > 1130
 PreReq:         sysvinit(syslog)
 %endif
@@ -75,7 +75,8 @@ This functionality is exercised in the driver.
 %package -n libpcsclite1
 License:        BSD3c(or similar)
 Group:          System/Libraries
-Summary:        PCS Smart Cards Library
+Summary:        PCSC Smart Card Library
+Recommends:     pcsc-lite >= %{version}
 
 %description -n libpcsclite1
 The purpose of PCSC Lite is to provide a Windows(R) SCard interface in
@@ -99,7 +100,8 @@ This functionality is exercised in the driver.
 License:        BSD3c(or similar)
 Group:          Development/Libraries/C and C++
 Summary:        Development package for the MUSCLE project SmartCards library
-Requires:       %{name} = %{version} pcsc-lite glibc-devel
+Requires:       %{name} = %{version}-%{release}
+Requires:       libpcsclite1 = %{version}-%{release}
 
 %description devel
 This package contains the development files for pcsc-lite. It allows to
@@ -133,31 +135,31 @@ mkdir -p $RPM_BUILD_ROOT%{ifddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/
 sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
 # 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
-ln -sf ../../etc/init.d/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd
+#install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/
+install -D -m 755 pcsc-lite-init $RPM_BUILD_ROOT%{_initrddir}/pcscd
+ln -sf %{_initrddir}/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
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-usr/sbin/groupadd -r -o %{GROUP} 2>/dev/null || :
-usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false -c "Smart Card Reader" -d /sbin %{USER} 2>/dev/null || :
-
-%preun
-%{stop_on_removal pcscd}
+getent group %{GROUP} >/dev/null || groupadd -r -o %{GROUP}
+getent passwd %{USER} >/dev/null || useradd -r -o -g %{GROUP} -s /bin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER}
+exit 0
 
 %post
-%{fillup_and_insserv -y -n pcscd pcscd}
+%fillup_and_insserv -y -n pcscd pcscd
+%restart_on_update pcscd
+
+%preun
+%stop_on_removal pcscd
 
 %postun
-%{restart_on_update pcscd}
-%{insserv_cleanup}
+%insserv_cleanup
 
 %post -n libpcsclite1 -p /sbin/ldconfig
 
@@ -166,14 +168,12 @@ usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false -c "Smart Card Reader" -d /sbin
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}
-# .so must be in the main package (#235773):
-%{_libdir}/*.so
 %doc %{_mandir}/man?/*.*
 %{_sbindir}/*
 %dir %{_sysconfdir}/reader.conf.d
 %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf
 %{ifddir}
-/etc/init.d/pcscd
+%{_initrddir}/pcscd
 /var/adm/fillup-templates/sysconfig.pcscd
 
 %files -n libpcsclite1
@@ -183,6 +183,7 @@ usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false -c "Smart Card Reader" -d /sbin
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/*.so
 %{_libdir}/*.*a
 %{_libdir}/pkgconfig/*.pc