From f01231bc481833395a334ee512d2a7f6c5a3d0f1 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Fri, 1 Jan 2021 08:21:57 +0800 Subject: [PATCH] upgrade version to 1.1.2 --- libserverframe.spec | 8 ++++---- src/Makefile.in | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libserverframe.spec b/libserverframe.spec index 414aabe..4a15e01 100644 --- a/libserverframe.spec +++ b/libserverframe.spec @@ -2,19 +2,19 @@ %define CommitVersion %(echo $COMMIT_VERSION) Name: libserverframe -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: mc common framework library -License: GPL +License: AGPL v3.0 Group: Arch/Tech URL: http://github.com/happyfish100/libfastcommon/ Source: http://github.com/happyfish100/libfastcommon/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libfastcommon-devel >= 1.0.45 +BuildRequires: libfastcommon-devel >= 1.0.46 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id -Requires: libfastcommon >= 1.0.45 +Requires: libfastcommon >= 1.0.46 %description common framework library commit version: %{CommitVersion} diff --git a/src/Makefile.in b/src/Makefile.in index af7edae..7435c2f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -58,7 +58,8 @@ install: cp -f $(IDEMP_SERVER_HEADER) $(TARGET_PREFIX)/include/sf/idempotency/server cp -f $(IDEMP_CLIENT_HEADER) $(TARGET_PREFIX)/include/sf/idempotency/client - if [ ! -e $(TARGET_PREFIX)/lib/libserverframe.so ]; then ln -s $(TARGET_LIB)/libserverframe.so $(TARGET_PREFIX)/lib/libserverframe.so; fi + @BUILDROOT=$$(echo "$(TARGET_PREFIX)" | grep BUILDROOT); \ + if [ -z "$$BUILDROOT" ] && [ ! -e $(TARGET_PREFIX)/lib/libserverframe.so ]; then ln -s $(TARGET_LIB)/libserverframe.so $(TARGET_PREFIX)/lib/libserverframe.so; fi clean: rm -f $(ALL_OBJS) $(ALL_LIBS) $(ALL_PRGS)