Accepting request 136287 from home:AndreasStieger:branches:Base:System

- update to libksba 1.3.0
  - change license from GPLv2 to LGPLv3/GPLv2
  - minor bug fixes
- implement shared library packaging policy

Please review the license change.

OBS-URL: https://build.opensuse.org/request/show/136287
OBS-URL: https://build.opensuse.org/package/show/Base:System/libksba?expand=0&rev=19

libksba-1.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09afce65b03d027cbec10d21464f4f651cdfd269e38b404f83e48d3e2a3c934b
-size 588323

libksba-1.3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971
+size 624704

libksba.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 27 19:33:30 UTC 2012 - andreas.stieger@gmx.de
+
+- update to libksba 1.3.0
+  - change license from GPLv2 to LGPLv3/GPLv2
+  - minor bug fixes
+- implement shared library packaging policy
+
 -------------------------------------------------------------------
 Sat Nov 19 20:38:30 UTC 2011 - coolo@suse.com
 

libksba.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libksba
 #
-# 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
@@ -16,18 +16,15 @@
 #
 
 
-
 Name:           libksba
-Version:        1.2.0
+Version:        1.3.0
-Release:        1
+Release:        0
-License:        GPLv3+
+%define soname 8
 Summary:        A X.509 Library
-Url:            http://www.gnupg.org/aegypten/
+License:        (LGPL-3.0+ or GPL-2.0+) and GPL-3.0+ and MIT
 Group:          Development/Libraries/C and C++
-# change also name and nfb
+Url:            http://www.gnupg.org/aegypten/
-%define nld_build 0
 Source:         libksba-%{version}.tar.bz2
-Patch1:         nld-build.diff
 BuildRequires:  libgpg-error-devel >= 1.8
 BuildRequires:  libtool
 PreReq:         %install_info_prereq
@@ -37,17 +34,22 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 KSBA is a library to simplify the task of working with X.509
 certificates, CMS data, and related data.
 
-%package devel
+%package -n %{name}%{soname}
-License:        GPLv2+ ; MIT License (or similar)
+Summary:        A X.509 Library
+Group:          Development/Libraries/C and C++
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+
+%description -n %{name}%{soname}
+KSBA is a library to simplify the task of working with X.509
+certificates, CMS data, and related data.
+
+%package devel
 Summary:        A X.509 Library
 Group:          Development/Libraries/C and C++
-%if %nld_build
-Conflicts:      libksba-devel
-%else
 Requires:       libgpg-error-devel
 Requires:       libksba = %{version}
 Provides:       libksba:/usr/include/ksba.h
-%endif
 
 %description devel
 KSBA is a library to simplify the task of working with X.509
@@ -58,12 +60,8 @@ libksba.
 
 %prep
 %setup -q -n libksba-%{version}
-%if %nld_build
-%patch1
-%endif
 
 %build
-autoreconf -fi
 %configure --disable-static --with-pic
 make %{?_smp_mflags}
 
@@ -74,14 +72,14 @@ make check
 %make_install
 rm -fv %{buildroot}%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
+%post -n %{name}%{soname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{name}%{soname} -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -n %{name}%{soname}
 %defattr(-,root,root)
 %doc README AUTHORS COPYING ChangeLog NEWS THANKS TODO
 %{_libdir}/libksba*.so.*

nld-build.diff

@@ -1,50 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -140,7 +140,7 @@
- 
- 
- # To be used in ksba-config
--KSBA_CONFIG_LIBS="-lksba"
-+KSBA_CONFIG_LIBS="-lksba-nld"
- KSBA_CONFIG_CFLAGS=""
- AC_SUBST(KSBA_CONFIG_LIBS)
- AC_SUBST(KSBA_CONFIG_CFLAGS)
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -26,7 +26,7 @@
- BUILT_SOURCES = asn1-parse.c asn1-tables.c
- bin_SCRIPTS = ksba-config
- include_HEADERS = ksba.h
--lib_LTLIBRARIES = libksba.la
-+lib_LTLIBRARIES = libksba-nld.la
- 
- if ! CROSS_COMPILING
- noinst_PROGRAMS = asn1-gentables ber-dump
-@@ -46,12 +46,12 @@
- 
- 
- 
--libksba_la_LDFLAGS = $(libksba_version_script_cmd) -version-info \
-+libksba_nld_la_LDFLAGS = $(libksba_version_script_cmd) -version-info \
-       @LIBKSBA_LT_CURRENT@:@LIBKSBA_LT_REVISION@:@LIBKSBA_LT_AGE@
--libksba_la_INCLUDES = -I$(top_srcdir)/lib 
--libksba_la_DEPENDENCIES = $(srcdir)/libksba.vers
-+libksba_nld_la_INCLUDES = -I$(top_srcdir)/lib 
-+libksba_nld_la_DEPENDENCIES = $(srcdir)/libksba.vers
- 
--libksba_la_SOURCES = \
-+libksba_nld_la_SOURCES = \
- 	ksba.h \
- 	reader.c reader.h \
- 	writer.c writer.h \
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -44,7 +44,7 @@
- 
- noinst_HEADERS = t-common.h
- noinst_PROGRAMS = $(TESTS) t-cms-parser t-crl-parser t-dnparser t-ocsp
--LDADD = ../src/libksba.la $(GPG_ERROR_LIBS)
-+LDADD = ../src/libksba-nld.la $(GPG_ERROR_LIBS)
- 
- t_ocsp_SOURCES = t-ocsp.c sha1.c
-