Hello community, here is the log from the commit of package openct for openSUSE:Factory checked in at 2015-03-11 09:59:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openct (Old) and /work/SRC/openSUSE:Factory/.openct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openct" Changes: -------- --- /work/SRC/openSUSE:Factory/openct/openct.changes 2014-05-22 20:38:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openct.new/openct.changes 2015-03-11 09:59:01.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 10 08:35:37 UTC 2015 - [email protected] + +- Move restart_on_update to correct condition. + +------------------------------------------------------------------- +Tue Mar 10 08:26:54 UTC 2015 - [email protected] + +- Install %udevdir/openct_usb file. Should fix bnc#681680 + +------------------------------------------------------------------- +Tue Mar 10 08:18:57 UTC 2015 - [email protected] + +- Cleanup with spec-cleaner +- Remove some old conditions +- Add new Url +- Update openct-init.patch to not default start on rl4 bnc#750310 + +------------------------------------------------------------------- @@ -13 +31 @@ - * Fixes Bug 580144, partial Bug 681680, maybe Bug 544895 + * Fixes bnc#580144, partial bnc#681680, maybe bnc#544895 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openct.spec ++++++ --- /var/tmp/diff_new_pack.eztRnb/_old 2015-03-11 09:59:02.000000000 +0100 +++ /var/tmp/diff_new_pack.eztRnb/_new 2015-03-11 09:59:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openct # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,45 +16,29 @@ # -%if 0%{?sles_version} == 10 -%define _udevdir /lib/udev -%else +# These UID and GID must be equal to values in the pcsc-lite.spec: +%define USER scard +%define GROUP scard +%define ifddir %(pkg-config libpcsclite --variable=usbdropdir) +%define LBRACE ( +%define RBRACE ) +%define QUOTE " +%define BACKSLASH \\ +%define USBDRIVERS %(set -x ; bunzip2 <%{SOURCE0} | sed -n 's/^ENV{MODALIAS}==%{QUOTE}%{BACKSLASH}%{LBRACE}usb:[^{QUOTE}]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}*%{QUOTE}.*$/modalias%{LBRACE}%{BACKSLASH}1d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') %define _udevdir %(pkg-config --variable=udevdir udev) +%{!?_udevrulesdir: %define _udevrulesdir %{_udevdir}/rules.d} +%if 0%{?suse_version} > 1140 +%define has_systemd 1 +BuildRequires: systemd-rpm-macros +%{?systemd_requires} %endif -%if "x%{?_udevdir}" == "x" -%if 0%{?sles_version} == 11 -%define _udevdir /lib/udev -%endif -%endif - -%if "x%{?_udevrulesdir}" == "x" -%if 0%{?sles_version} >= 11 -%define _udevrulesdir %{_udevdir}/rules.d -%else -%define _udevrulesdir %{_udevdir} -%endif -%endif - Name: openct Version: 0.6.20 Release: 0 -BuildRequires: db-devel -BuildRequires: doxygen -BuildRequires: krb5-devel -BuildRequires: libtool -%if 0%{?sles_version} > 10 -BuildRequires: libudev-devel -%endif -BuildRequires: libusb-devel -BuildRequires: openldap2-devel -BuildRequires: pcsc-lite-devel -BuildRequires: pkg-config -BuildRequires: udev -PreReq: %insserv_prereq %fillup_prereq -Url: http://www.opensc-project.org/openct/ Summary: Tools for Smart Card Readers License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Security +Url: https://github.com/OpenSC/openct/wiki Source: %{name}-%{version}.tar.bz2 Source2: README.SUSE Source3: baselibs.conf @@ -65,44 +49,38 @@ Patch2: %{name}-udev-permission.patch Patch3: %{name}-systemd.patch Patch4: %{name}-disable_forcepool.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# These UID and GID must be equal to values in the pcsc-lite.spec: -%define USER scard -%define GROUP scard +BuildRequires: db-devel +BuildRequires: doxygen +BuildRequires: krb5-devel +BuildRequires: libtool +BuildRequires: libusb-devel +BuildRequires: openldap2-devel +BuildRequires: pcsc-lite-devel +BuildRequires: pkg-config +BuildRequires: udev +%if !0%{?has_systemd} +Requires(post): %insserv_prereq %fillup_prereq +%endif # 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 " -%define BACKSLASH \\ -%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | sed -n 's/^ENV{MODALIAS}==%{QUOTE}%{BACKSLASH}%{LBRACE}usb:[^{QUOTE}]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}*%{QUOTE}.*$/modalias%{LBRACE}%{BACKSLASH}1d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') # We are not using Supplements here. User may want to choose between openct and pcsc-lite: -Enhances: %USBDRIVERS +Enhances: %{USBDRIVERS} # Generic CCID devices: Enhances: modalias(usb:*ic0Bisc00d*dc*dsc*dp*ic*isc*ip*) -%if 0%{?suse_version} > 1140 -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%define has_systemd 1 -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libudev-devel %description OpenCT is a set of library and tools to talk to smart card readers. OpenCT is used by the OpenSC Smart Card library. For a list of supported readers, please read documentation in -/usr/share/doc/packages/openct/wiki/index.html - some readers may be +%{_docdir}/openct/wiki/index.html - some readers may be supported only with particular firmware or particular connection type. There are other packages that may support your reader in a different way. Name of all these packages starts with "pcsc-". -Authors: --------- - Olaf Kirch <[email protected]> - Andreas Jellinghaus <[email protected]> - %package -n libopenct1 Summary: Library for Smart Card Readers Group: System/Libraries @@ -112,17 +90,12 @@ OpenCT is used by the OpenSC Smart Card library. For a list of supported readers, please read documentation in -/usr/share/doc/packages/openct/wiki/index.html - some readers may be +%{_docdir}/openct/wiki/index.html - some readers may be supported only with particular firmware or particular connection type. There are other packages that may support your reader in a different way. Name of all these packages starts with "pcsc-". -Authors: --------- - Olaf Kirch <[email protected]> - Andreas Jellinghaus <[email protected]> - %package -n pcsc-openct Summary: PC/SC IFD Handler for OpenCT Smart Card Drivers Group: Productivity/Security @@ -135,17 +108,12 @@ OpenCT is used by the OpenSC Smart Card library. For a list of supported readers, please read documentation in -/usr/share/doc/packages/openct/wiki/index.html - some readers may be +%{_docdir}/openct/wiki/index.html - some readers may be supported only with particular firmware or particular connection type. There are other packages that may support your reader in a different way. Name of all these packages starts with "pcsc-". -Authors: --------- - Olaf Kirch <[email protected]> - Andreas Jellinghaus <[email protected]> - %package devel Summary: Library for Smart Card Readers Group: Development/Libraries/C and C++ @@ -157,21 +125,16 @@ OpenCT is used by the OpenSC Smart Card library. For a list of supported readers, please read documentation in -/usr/share/doc/packages/openct/wiki/index.html - some readers may be +%{_docdir}/openct/wiki/index.html - some readers may be supported only with particular firmware or particular connection type. There are other packages that may support your reader in a different way. Name of all these packages starts with "pcsc-". -Authors: --------- - Olaf Kirch <[email protected]> - Andreas Jellinghaus <[email protected]> - %prep -%setup -q -n %{name}-%{version} -cp -a %{S:2} . +%setup -q +cp -a %{SOURCE2} . %patch1 %patch2 -p1 %if 0%{?has_systemd} @@ -185,91 +148,87 @@ mv doc/nonpersistent/wiki.out/trac.css.unix doc/nonpersistent/wiki.out/trac.css %build -%if %suse_version > 1110 +%if 0%{?suse_version} > 1110 ACLOCAL="aclocal -I m4" autoreconf -f -i %endif -%configure\ - --docdir=%{_docdir}/%{name}\ - --disable-static\ - --enable-doc\ - --enable-api-doc\ - --enable-usb\ - --enable-pcsc\ - --enable-non-privileged\ - --with-daemon-user=%{USER}\ - --with-daemon-groups=%{GROUP}\ - --with-bundle=%{ifddir}\ - --with-ifddir=%{ifddir}\ +%configure \ + --docdir=%{_docdir}/%{name} \ + --disable-static \ + --enable-doc \ + --enable-api-doc \ + --enable-usb \ + --enable-pcsc \ + --enable-non-privileged \ + --with-daemon-user=%{USER} \ + --with-daemon-groups=%{GROUP} \ + --with-bundle=%{ifddir} \ + --with-ifddir=%{ifddir} \ --with-udev=%{_udevdir} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -%makeinstall -# +mkdir -p %{buildroot}%{_sysconfdir} +make DESTDIR=%{buildroot} install %{?_smp_mflags} # meanless to create on /run as it is tmpfs -%if 0%{?suse_version} >= 1220 -mkdir -p "%{buildroot}/usr/lib/tmpfiles.d/" -cat >%{buildroot}/usr/lib/tmpfiles.d/%{name}.conf <<EOF -d /var/run/%{name} 0755 %{USER} %{GROUP} +%if 0%{?has_systemd} +mkdir -p "%{buildroot}%{_libexecdir}/tmpfiles.d/" +cat >%{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf <<EOF +d %{_localstatedir}/run/%{name} 0755 %{USER} %{GROUP} EOF %else # Create directory -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/openct +mkdir -p %{buildroot}%{_localstatedir}/run/openct # NOTE: Example in the source recommends 750, but this value allows # access only to dedicated users and root. -chmod 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct +chmod 0755 %{buildroot}%{_localstatedir}/run/openct %endif # Install 60-openct.rules rule for udev -mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir} -install -m0644 etc/openct.udev $RPM_BUILD_ROOT%{_udevrulesdir}/60-openct.rules +mkdir -p %{buildroot}%{_udevrulesdir} +install -m0644 etc/openct.udev %{buildroot}%{_udevrulesdir}/60-openct.rules %if 0%{?has_systemd} # add systemd services (based on http://blog.fraggod.net/2012/06/16/proper-ish-way-to-start-long-running-systemd-service-on-udev-event-device-hotplug.html) -install -D -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{name}[email protected] -ln -s /usr/sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcopenct -rm -f $RPM_BUILD_ROOT%{_udevdir}/openct_* +install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}[email protected] +ln -s service %{buildroot}%{_sbindir}/rcopenct %else # Install init script -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -install etc/init-script $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openct -ln -s ../..%{_sysconfdir}/init.d/openct $RPM_BUILD_ROOT%{_sbindir}/rcopenct +mkdir -p %{buildroot}%{_sysconfdir}/init.d +install etc/init-script %{buildroot}%{_sysconfdir}/init.d/openct +ln -s ../..%{_sysconfdir}/init.d/openct %{buildroot}%{_sbindir}/rcopenct %endif # # Copy the rest of documentation -cp LGPL-2.1 README.SUSE TODO doc/nonpersistent/ChangeLog etc/openct-disable.fdi $RPM_BUILD_ROOT%{_docdir}/%{name} +cp LGPL-2.1 README.SUSE TODO doc/nonpersistent/ChangeLog etc/openct-disable.fdi %{buildroot}%{_docdir}/%{name} # And remove pointless .la file -rm $RPM_BUILD_ROOT%{_libdir}/libopenct.la +find %{buildroot} -type f -name "*.la" -delete -print %pre %if 0%{?has_systemd} -%service_add_pre %{name}.service +%service_add_pre %{name}.service [email protected] %endif %preun %{stop_on_removal openct} %if 0%{?has_systemd} -%service_del_preun %{name}.service +%service_del_preun %{name}.service [email protected] %endif %post %if 0%{?has_systemd} -%service_add_post %{name}.service +%service_add_post %{name}.service [email protected] +systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/%{name}.conf %else %{fillup_and_insserv -y openct} %endif -%if 0%{?suse_version} >= 1220 -systemd-tmpfiles --create /usr/lib/tmpfiles.d/%{name}.conf -%endif %postun -%{restart_on_update openct} %if 0%{?has_systemd} -%service_del_postun %{name}.service +%service_del_postun %{name}.service [email protected] %else -%{insserv_cleanup} +%{restart_on_update openct} +%insserv_cleanup %endif %post -n libopenct1 -p /sbin/ldconfig @@ -288,21 +247,20 @@ %doc %{_docdir}/%{name}/openct-disable.fdi %doc %{_docdir}/%{name}/wiki %{_bindir}/* -%if 0%{?suse_version} >= 1220 -/usr/lib/tmpfiles.d/openct.conf -%else -%ghost %dir %{_localstatedir}/run/openct -%endif %doc %{_mandir}/man?/*.* %{_sbindir}/* %config(noreplace) %{_sysconfdir}/openct.conf +# SLE11 needs it. Expansion from the preamble does not apply here: +%{!?_udevrulesdir: %define _udevrulesdir %{_udevdir}/rules.d} %{_udevrulesdir}/60-openct.rules +%{_udevdir}/openct_* %if 0%{?has_systemd} %{_unitdir}/%{name}.service %{_unitdir}/%{name}[email protected] +%{_libexecdir}/tmpfiles.d/openct.conf %else -%{_udevdir}/openct_* %{_sysconfdir}/init.d/openct +%ghost %dir %{_localstatedir}/run/openct %endif %files -n libopenct1 @@ -318,7 +276,6 @@ %doc %{_docdir}/%{name}/api %{_includedir}/openct %{_libdir}/*.so -%{_libdir}/*.*a %{_libdir}/pkgconfig/libopenct.pc %changelog ++++++ openct-init.patch ++++++ --- /var/tmp/diff_new_pack.eztRnb/_old 2015-03-11 09:59:02.000000000 +0100 +++ /var/tmp/diff_new_pack.eztRnb/_new 2015-03-11 09:59:02.000000000 +0100 @@ -1,6 +1,8 @@ ---- etc/init-script.in +Index: etc/init-script.in +=================================================================== +--- etc/init-script.in.orig +++ etc/init-script.in -@@ -2,8 +2,8 @@ +@@ -2,11 +2,11 @@ ### BEGIN INIT INFO # Provides: openct @@ -10,7 +12,11 @@ +# Required-Stop: $syslog $remote_fs # Should-Start: $local_fs # Should-Stop: $local_fs - # Default-Start: 2 3 4 5 +-# Default-Start: 2 3 4 5 ++# Default-Start: 2 3 5 + # Default-Stop: 0 1 6 + # Short-Description: smart card terminal framework + # Description: Initialize the OpenCT smart card terminal @@ -20,7 +20,11 @@ STATUS_FILE="$STATUS_DIR/status" NAME=OpenCT DESC="smart card terminal framework" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
