Hello community, here is the log from the commit of package libosmocore for openSUSE:Factory checked in at 2020-06-07 21:38:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmocore (Old) and /work/SRC/openSUSE:Factory/.libosmocore.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmocore" Sun Jun 7 21:38:18 2020 rev:24 rq:812118 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libosmocore/libosmocore.changes 2020-01-08 17:55:25.349668363 +0100 +++ /work/SRC/openSUSE:Factory/.libosmocore.new.3606/libosmocore.changes 2020-06-07 21:38:43.445527274 +0200 @@ -1,0 +2,6 @@ +Fri Jun 5 23:00:54 UTC 2020 - Jan Engelhardt <[email protected]> + +- Update to release 1.3.1 + * Changes to build procedure only. + +------------------------------------------------------------------- Old: ---- libosmocore-1.3.0.tar.xz New: ---- libosmocore-1.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmocore.spec ++++++ --- /var/tmp/diff_new_pack.tieUem/_old 2020-06-07 21:38:44.389530266 +0200 +++ /var/tmp/diff_new_pack.tieUem/_new 2020-06-07 21:38:44.389530266 +0200 @@ -1,7 +1,7 @@ # # spec file for package libosmocore # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libosmocore -Version: 1.3.0 +Version: 1.3.1 Release: 0 Summary: The Open Source Mobile Communications Core Library License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later @@ -305,16 +305,15 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure \ +%configure CFLAGS="%optflags -fcommon" \ --enable-shared \ --disable-static \ --includedir="%_includedir/%name" make %{?_smp_mflags} %install -b="%buildroot" -make %{?_smp_mflags} install DESTDIR="$b" -find "$b/%_libdir" -type f -name "*.la" -delete +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) @@ -426,11 +425,9 @@ %_libdir/pkgconfig/libosmovty.pc %files -n libosmousb0 -%defattr(-,root,root) %_libdir/libosmousb.so.0* %files -n libosmousb-devel -%defattr(-,root,root) %dir %_includedir/%name %dir %_includedir/%name/osmocom %_includedir/%name/osmocom/usb/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.tieUem/_old 2020-06-07 21:38:44.413530342 +0200 +++ /var/tmp/diff_new_pack.tieUem/_new 2020-06-07 21:38:44.417530355 +0200 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/libosmocore</param> - <param name="revision">1.3.0</param> - <param name="versionformat">1.3.0</param> + <param name="revision">1.3.1</param> + <param name="versionformat">1.3.1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ libosmocore-1.3.0.tar.xz -> libosmocore-1.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmocore-1.3.0/configure.ac new/libosmocore-1.3.1/configure.ac --- old/libosmocore-1.3.0/configure.ac 2020-01-02 18:42:30.000000000 +0100 +++ new/libosmocore-1.3.1/configure.ac 2020-03-16 11:41:51.000000000 +0100 @@ -142,6 +142,7 @@ ]) AS_IF([test "x$ENABLE_PCSC" = "xyes"], [ PKG_CHECK_MODULES(PCSC, libpcsclite) + AC_DEFINE([HAVE_PCSC],[1],[Build with PC/SC support]) ]) AM_CONDITIONAL(ENABLE_PCSC, test "x$ENABLE_PCSC" = "xyes") AC_SUBST(ENABLE_PCSC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmocore-1.3.0/debian/changelog new/libosmocore-1.3.1/debian/changelog --- old/libosmocore-1.3.0/debian/changelog 2020-01-02 18:42:30.000000000 +0100 +++ new/libosmocore-1.3.1/debian/changelog 2020-03-16 11:41:51.000000000 +0100 @@ -1,3 +1,9 @@ +libosmocore (1.3.1) unstable; urgency=medium + + * libosmosim: Build irrespective of PC/SC support + + -- Harald Welte <[email protected]> Mon, 16 Mar 2020 11:41:50 +0100 + libosmocore (1.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmocore-1.3.0/src/sim/Makefile.am new/libosmocore-1.3.1/src/sim/Makefile.am --- old/libosmocore-1.3.0/src/sim/Makefile.am 2020-01-02 18:42:30.000000000 +0100 +++ new/libosmocore-1.3.1/src/sim/Makefile.am 2020-03-16 11:41:51.000000000 +0100 @@ -4,24 +4,26 @@ LIBVERSION=1:2:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) +AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) -if ENABLE_PCSC -# FIXME: only build the PC/SC dependent part conditional, but always build other parts - noinst_HEADERS = sim_int.h gsm_int.h +if !EMBEDDED lib_LTLIBRARIES = libosmosim.la -libosmosim_la_SOURCES = core.c reader.c reader_pcsc.c class_tables.c \ +libosmosim_la_SOURCES = core.c reader.c class_tables.c \ card_fs_sim.c card_fs_usim.c card_fs_uicc.c \ card_fs_isim.c card_fs_tetra.c libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) libosmosim_la_LIBADD = \ $(top_builddir)/src/libosmocore.la \ $(top_builddir)/src/gsm/libosmogsm.la \ - $(TALLOC_LIBS) \ - $(PCSC_LIBS) - + $(TALLOC_LIBS) +if ENABLE_PCSC +AM_CFLAGS += $(PCSC_CFLAGS) +libosmosim_la_SOURCES += reader_pcsc.c +libosmosim_la_LIBADD += $(PCSC_LIBS) endif + +endif # !EMBEDDED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmocore-1.3.0/src/sim/reader.c new/libosmocore-1.3.1/src/sim/reader.c --- old/libosmocore-1.3.0/src/sim/reader.c 2020-01-02 18:42:30.000000000 +0100 +++ new/libosmocore-1.3.1/src/sim/reader.c 2020-03-16 11:41:51.000000000 +0100 @@ -35,6 +35,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/sim/sim.h> +#include "config.h" #include "sim_int.h" @@ -242,9 +243,11 @@ struct osim_reader_hdl *rh; switch (driver) { +#ifdef HAVE_PCSC case OSIM_READER_DRV_PCSC: ops = &pcsc_reader_ops; break; +#endif default: return NULL; }
