Hello community,

here is the log from the commit of package openCryptoki for openSUSE:Factory 
checked in at 2012-12-10 17:17:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openCryptoki (Old)
 and      /work/SRC/openSUSE:Factory/.openCryptoki.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openCryptoki", Maintainer is "jjo...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/openCryptoki/openCryptoki.changes        
2011-11-28 12:55:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openCryptoki.new/openCryptoki.changes   
2012-12-10 17:17:25.000000000 +0100
@@ -1,0 +2,6 @@
+Sat Dec  8 18:51:31 UTC 2012 - meiss...@suse.com
+
+- remove -o from groupadd
+- fixed sed script to not a grouplist with leading ,
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openCryptoki.spec ++++++
--- /var/tmp/diff_new_pack.07BELj/_old  2012-12-10 17:17:26.000000000 +0100
+++ /var/tmp/diff_new_pack.07BELj/_new  2012-12-10 17:17:26.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package openCryptoki
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define openCryptoki_32bit_arch %ix86 s390 ppc %arm
 # support in the workings for: ppc64
@@ -27,12 +26,16 @@
 %define oc_cvs_tag opencryptoki-%{version}
 
 Name:           openCryptoki
-BuildRequires:  gcc-c++ libica libtool openssl-devel pwdutils
+BuildRequires:  gcc-c++
+BuildRequires:  libica
+BuildRequires:  libtool
+BuildRequires:  openssl-devel
+BuildRequires:  pwdutils
 Summary:        An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM 
Cryptographic Hardware
-Version:        2.2.6
-Release:        0
 License:        IPL-1.0
 Group:          Productivity/Security
+Version:        2.2.6
+Release:        0
 # :pserver:anonym...@cvs.sourceforge.net:/cvsroot/opencryptoki
 # cvs co -r openCryptoki-2-1-5 -d openCryptoki-2-1-5 .
 Source:         %{oc_cvs_tag}.tar.bz2
@@ -55,10 +58,11 @@
 
 
 %package devel
-License:        IPL-1.0
 Summary:        An Implementation of PKCS#11 (Cryptoki) v2.01 for IBM 
Cryptographic Hardware
 Group:          Development/Languages/C and C++
-Requires:       openCryptoki = %{version}-%{release}, glibc-devel, 
openssl-devel
+Requires:       glibc-devel
+Requires:       openCryptoki = %{version}-%{release}
+Requires:       openssl-devel
 
 %description devel
 The PKCS#11 version 2.01 API implemented for the IBM cryptographic
@@ -71,7 +75,6 @@
 %ifarch %openCryptoki_32bit_arch
 
 %package 32bit
-License:        IPL-1.0
 Summary:        An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM 
Cryptographic Hardware
 Group:          Productivity/Security
 # this is needed to make sure the pkcs11 group exists before
@@ -94,7 +97,6 @@
 %ifarch %openCryptoki_64bit_arch
 
 %package 64bit
-License:        IPL-1.0
 Summary:        An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM 
Cryptographic Hardware
 Group:          Productivity/Security
 # this is needed to make sure the pkcs11 group exists before
@@ -141,14 +143,15 @@
 %pre
 # autobuild:/work/cd/lib/misc/group
 # openCryptoki    pkcs11:x:64:
-/usr/sbin/groupadd -g %pkcs11_group_id -o -r pkcs11 2>/dev/null || true
-# add root to group pkcs11 to enable root to run pkcsconf
+/usr/sbin/groupadd -g %pkcs11_group_id -r pkcs11 2>/dev/null || true
 /usr/sbin/usermod -G $(/usr/bin/id --groups --name root | /bin/sed \
 -e 's/root//' -e '
 # add the pkcs group if it is missing
 /(^| )pkcs11( |$)/!s/$/ pkcs11/
 # replace spaces by commas
 y/ /,/
+# remove leading , if present
+s/^,//
 '),pkcs11  root
 
 %post

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to