Hello community,
here is the log from the commit of package openct for openSUSE:Factory
checked in at Fri Jan 14 17:05:05 CET 2011.
--------
--- openct/openct.changes 2009-12-15 10:30:17.000000000 +0100
+++ openct/openct.changes 2011-01-10 19:37:50.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Jan 10 19:37:29 CET 2011 - sbrabec@suse.cz
+
+- Updated to version 0.6.20:
+ * Add support for Rutoken S.
+ * Update on udev rules.
+- Switched from HAL to udev.
+- Dedicated UID and GID are now created by pcsc-lite.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
openct-0.6.17.tar.bz2
openct-old-hal.patch
New:
----
openct-0.6.20.tar.bz2
openct-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openct.spec ++++++
--- /var/tmp/diff_new_pack.egCCDn/_old 2011-01-14 16:52:17.000000000 +0100
+++ /var/tmp/diff_new_pack.egCCDn/_new 2011-01-14 16:52:17.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package openct (Version 0.6.17)
+# spec file for package openct
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,36 +19,26 @@
Name: openct
-Version: 0.6.17
-Release: 3
-BuildRequires: db-devel doxygen krb5-devel libusb-devel licenses openldap2-devel pcsc-lite-devel pkg-config
-# NOTE: We prefer multiple RPM directory ownership here, because
-# dependency on hal increases bootstrap build time.
-#BuildRequires: hal
+Version: 0.6.20
+Release: 1
+BuildRequires: db-devel doxygen krb5-devel libusb-devel openldap2-devel pcsc-lite-devel pkg-config udev
PreReq: %insserv_prereq %fillup_prereq
Group: Productivity/Security
License: BSD3c(or similar) ; LGPLv2.1+
Url: http://www.opensc-project.org/openct/
-Summary: OpenCT Tools for Smart Card Readers
+Summary: Tools for Smart Card Readers
Source: %{name}-%{version}.tar.bz2
Source2: README.SUSE
Source3: baselibs.conf
+Source4: %{name}-rpmlintrc
Patch1: %{name}-init.patch
-Patch5: %{name}-old-hal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: licenses
-# bug437293
-%ifarch ppc64
-Obsoletes: openct-64bit
-%endif
-## Only for directory ownership:
-#Requires: hal
-# Existed up to 10.2, maintained in SLES9:
-Provides: pcsc-etoken <= 0.3.2
-Obsoletes: pcsc-etoken <= 0.3.2
-%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
+# These UID and GID must be equal to values in the pcsc-lite.spec:
%define USER scard
%define GROUP scard
+# openSUSE package pcsc-lite 1.6.6 is the first one which creates the scard UID and GID:
+Requires(post): pcsc-lite >= 1.6.6
+%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
%define LBRACE (
%define RBRACE )
%define QUOTE "
@@ -70,8 +60,6 @@
There are other packages that may support your reader in a different
way. Name of all these packages starts with "pcsc-".
-
-
Authors:
--------
Olaf Kirch
@@ -80,11 +68,7 @@
%package -n libopenct1
License: BSD3c(or similar) ; LGPLv2.1+
Group: System/Libraries
-Summary: OpenCT Library for Smart Card Readers
-# bug437293
-%ifarch ppc64
-Obsoletes: openct-64bit
-%endif
+Summary: Library for Smart Card Readers
%description -n libopenct1
OpenCT is a set of library and tools to talk to smart card readers.
@@ -97,8 +81,6 @@
There are other packages that may support your reader in a different
way. Name of all these packages starts with "pcsc-".
-
-
Authors:
--------
Olaf Kirch
@@ -123,8 +105,6 @@
There are other packages that may support your reader in a different
way. Name of all these packages starts with "pcsc-".
-
-
Authors:
--------
Olaf Kirch
@@ -133,13 +113,8 @@
%package devel
License: BSD3c(or similar) ; LGPLv2.1+
Group: Development/Libraries/C and C++
-Summary: OpenCT Library for Smart Card Readers
+Summary: Library for Smart Card Readers
Requires: libopenct1 = %{version} glibc-devel
-# bug437293
-%ifarch ppc64
-Obsoletes: openct-devel-64bit
-%endif
-#
%description devel
OpenCT is a set of library and tools to talk to smart card readers.
@@ -152,8 +127,6 @@
There are other packages that may support your reader in a different
way. Name of all these packages starts with "pcsc-".
-
-
Authors:
--------
Olaf Kirch
@@ -163,11 +136,10 @@
%setup -q -n %{name}-%{version}
cp -a %{S:2} .
%patch1
-%if %suse_version <= 1030
-# Patch and sed script converts fdi file to the new hal syntax:
-%patch5
-%endif
-sed -i 's/@USER@/%{USER}/g;s/@GROUP@/%{GROUP}/g' etc/openct.hald.in etc/init-script.in
+sed -i 's/@USER@/%{USER}/g;s/@GROUP@/%{GROUP}/g' etc/init-script.in
+tr -d \\r doc/nonpersistent/wiki.out/trac.css.unix
+touch -r doc/nonpersistent/wiki.out/trac.css doc/nonpersistent/wiki.out/trac.css.unix
+mv doc/nonpersistent/wiki.out/trac.css.unix doc/nonpersistent/wiki.out/trac.css
%build
%if %suse_version > 1110
@@ -184,23 +156,13 @@
--with-daemon-user=%{USER}\
--with-daemon-groups=%{GROUP}\
--with-bundle=%{ifddir}\
- --with-ifddir=%{ifddir}
-# FIXME: Fix PCMCIA and serial readers hotplug.
-# udev scripts are outdated, HAL rules don't exist yet:
-# --with-udev=%{_sysconfdir}/udev/rules.d\
+ --with-ifddir=%{ifddir}\
+ --with-udev=/lib/udev/rules.d
make %{?jobs:-j%jobs}
%install
%makeinstall
#
-# HAL stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
-cp etc/openct.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi
-cp etc/openct-policy.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/10-usb-openct.fdi
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/hal
-install etc/openct.hald $RPM_BUILD_ROOT%{_libexecdir}/hal/hald-addon-openct
-#
# Create directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/openct
# NOTE: Example in the source recommends 750, but this value allows
@@ -217,20 +179,12 @@
# And remove pointless .la file
rm $RPM_BUILD_ROOT%{_libdir}/libopenct.la
-%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 openct}
%post
# Remove possible orphans created by openct<=0.6.15 before openct-status-lock-orphans.patch (openSUSE <= 11.1, SLE <= 11):
rm -f %{_localstatedir}/run/openct/status.lock.*
-# Fix possible old ownership (openSUSE <= 11.1, SLE <= 11):
-chown -R %{USER}:%{GROUP} %{_localstatedir}/run/openct
-# Fix possible bad permissions (openSUSE < 11.1, SLE < 11):
-chmod 0755 %{_localstatedir}/run/openct
%{fillup_and_insserv -y openct}
%postun
@@ -256,21 +210,12 @@
%doc %{_docdir}/%{name}/openct-disable.fdi
%doc %{_docdir}/%{name}/wiki
%{_bindir}/*
-%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi
-%{_datadir}/hal/fdi/policy/10osvendor/10-usb-openct.fdi
-%dir %attr(-,%{USER},%{GROUP}) %{_localstatedir}/run/openct
-%{_libexecdir}/hal/hald-addon-*
+%ghost %dir %{_localstatedir}/run/openct
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
%{_sysconfdir}/init.d/openct
%config(noreplace) %{_sysconfdir}/openct.conf
-# NOTE: These directories logically belong to hal.
-# To prevent dependency on hal, add it to the file list.
-%dir %{_datadir}/hal
-%dir %{_datadir}/hal/fdi
-%dir %{_datadir}/hal/fdi/information
-%dir %{_datadir}/hal/fdi/information/10freedesktop
-%dir %{_libexecdir}/hal
+/lib/udev/rules.d/*
%files -n libopenct1
%defattr(-,root,root)
++++++ openct-0.6.17.tar.bz2 -> openct-0.6.20.tar.bz2 ++++++
++++ 29018 lines of diff (skipped)
++++++ openct-init.patch ++++++
--- /var/tmp/diff_new_pack.egCCDn/_old 2011-01-14 16:52:17.000000000 +0100
+++ /var/tmp/diff_new_pack.egCCDn/_new 2011-01-14 16:52:17.000000000 +0100
@@ -1,6 +1,17 @@
--- etc/init-script.in
+++ etc/init-script.in
-@@ -20,7 +20,11 @@
+@@ -2,8 +2,8 @@
+
+ ### BEGIN INIT INFO
+ # Provides: openct
+-# Required-Start: $syslog
+-# Required-Stop: $syslog
++# Required-Start: $syslog $remote_fs
++# Required-Stop: $syslog $remote_fs
+ # Should-Start: $local_fs
+ # Should-Stop: $local_fs
+ # Default-Start: 2 3 4 5
+@@ -20,7 +20,11 @@ STATUS_FILE="$STATUS_DIR/status"
NAME=OpenCT
DESC="smart card terminal framework"
@@ -13,7 +24,7 @@
# create the directory for our status and socket files,
# if it does not exist.
-@@ -32,39 +36,26 @@
+@@ -32,39 +36,26 @@ then
# this example would assign the directory to a group "scard"
# and set permissions so only users in that group can access
# smart card readers via openct.
@@ -60,7 +71,7 @@
restart|force-reload)
#
# If the "reload" option is implemented, move the "force-reload"
-@@ -78,12 +69,24 @@
+@@ -78,12 +69,24 @@ case "$1" in
fi
sleep 0.1
$DAEMON init
++++++ openct-rpmlintrc ++++++
# This is not an error. rpmlint cannot handle %() properly.
addFilter("specfile-error")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
