Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:ofono-ril-binder-plugin.changes
@@ -1,3 +1,12 @@ +* Fri Oct 02 2020 Slava Monich <slava.monich@jolla.com> - 1.0.16 +- [rilbinder] Install library with exe permissions. JB#51013 + +* Wed Jul 22 2020 Slava Monich <slava.monich@jolla.com> - 1.0.15 +- [aarch64] Install ofono plugins under %{_libdir}. JB#49681 + +* Fri Jul 03 2020 Slava Monich <slava.monich@jolla.com> - 1.0.14 +- [rilbinder] Fixed 64-bit build. JB#49681 + * Wed Mar 11 2020 Slava Monich <slava.monich@jolla.com> - 1.0.13 - [rilbinder] Hooked up RIL_REQUEST_OEM_HOOK_RAW. JB#43527 - [rilbinder] Removed unused field
[-] [+]	Changed	_service:tar_git:ofono-ril-binder-plugin.spec ^
@@ -1,8 +1,7 @@ Name: ofono-ril-binder-plugin -Version: 1.0.13 +Version: 1.0.16 Release: 1 Summary: Ofono RIL binder transport plugin -Group: Development/Libraries License: BSD URL: https://github.com/mer-hybris/ofono-ril-binder-plugin Source: %{name}-%{version}.tar.bz2 @@ -27,11 +26,11 @@ %setup -q -n %{name}-%{version} %build -make %{_smp_mflags} KEEP_SYMBOLS=1 release pkgconfig +make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig %install rm -rf %{buildroot} -make install-dev DESTDIR=%{buildroot} +make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev mkdir -p %{buildroot}/%{plugin_dir} %preun @@ -45,7 +44,6 @@ %package -n libgrilio-binder Summary: Binder based transport for libgrilio -Group: Development/Libraries Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: ofono >= %{ofono_version}
[-] [+]	Changed	_service:tar_git:ofono-ril-binder-plugin-1.0.16.tar.bz2/Makefile ^
@@ -32,7 +32,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 0 -VERSION_RELEASE = 13 +VERSION_RELEASE = 16 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -119,10 +119,7 @@ LIB_FULL_LDFLAGS = $(LIB_BASE_FLAGS) $(LDFLAGS) -shared \ -Wl,-soname,$(LIB_SONAME) $(shell pkg-config --libs $(LIB_PKGS)) -lpthread -ifndef KEEP_SYMBOLS -KEEP_SYMBOLS = 0 -endif - +KEEP_SYMBOLS ?= 0 ifneq ($(KEEP_SYMBOLS),0) RELEASE_FLAGS += -g endif @@ -246,8 +243,16 @@ strip $@ endif +# +# LIBDIR usually gets substituted with arch specific dir. +# It could be relative or absolute. +# + +LIBDIR ?= usr/lib +ABS_LIBDIR := $(shell echo /$(LIBDIR) \| sed -r 's\|/+\|/\|g') + $(PKGCONFIG): $(LIB_NAME).pc.in Makefile - sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@ + sed -e 's\|@version@\|$(PCVERSION)\|g' -e 's\|@libdir@\|$(ABS_LIBDIR)\|g' $< > $@ # # Install @@ -255,17 +260,16 @@ INSTALL = install INSTALL_DIRS = $(INSTALL) -d -INSTALL_LIBS = $(INSTALL) -m 755 INSTALL_FILES = $(INSTALL) -m 644 -INSTALL_LIB_DIR = $(DESTDIR)/usr/lib -INSTALL_PLUGIN_DIR = $(DESTDIR)/usr/lib/ofono/plugins INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(NAME) -INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig +INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR) +INSTALL_PLUGIN_DIR = $(INSTALL_LIB_DIR)/ofono/plugins +INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig install: $(INSTALL_LIB_DIR) $(INSTALL_PLUGIN_DIR) - $(INSTALL_LIBS) $(RELEASE_PLUGIN) $(INSTALL_PLUGIN_DIR) - $(INSTALL_LIBS) $(RELEASE_LIB) $(INSTALL_LIB_DIR) + $(INSTALL) -m 755 $(RELEASE_PLUGIN) $(INSTALL_PLUGIN_DIR) + $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR) ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2) ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
[-] [+]	Changed	_service:tar_git:ofono-ril-binder-plugin-1.0.16.tar.bz2/libgrilio-binder.pc.in ^
@@ -1,10 +1,10 @@ name=grilio-binder -libdir=/usr/lib +libdir=@libdir@ includedir=/usr/include Name: libgrilio-binder Description: Binder based transport for libgrilio -Version: [version] +Version: @version@ Requires.private: glib-2.0 libgrilio libglibutil libgbinder-radio libgbinder Libs: -L${libdir} -l${name} Cflags: -I${includedir} -I${includedir}/${name}