From ec8edd0ce17bb99fe4d4793e087141b09333f613 Mon Sep 17 00:00:00 2001 From: Hoyub Lee Date: Tue, 4 Jul 2017 18:03:12 +0900 Subject: [PATCH] Change rpm package versioning policy libtpl-egl - RPM package version changes to (MAJOR).(MINOR).(PATCH)-(RELEASE) libwayland-egl - RPM package version is separately managed with libtpl-egl Change-Id: I25ed5152d62d1181f8635de43f877c67c7733da6 Signed-off-by: Hoyub Lee --- Makefile | 4 ++-- packaging/libtpl-egl.spec | 60 ++++++++++++++++++++++++----------------------- tc/Makefile | 2 +- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index efd8024..97996bc 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ $(findstring -$1-,-$(TPL_OPTIONS)-) endef SRC_DIR = ./src -SO_NAME = libtpl-egl.so.$(TPL_VER_MAJOR).$(TPL_VER_MINOR) -BIN_NAME = $(SO_NAME).$(TPL_RELEASE) +SO_NAME = libtpl-egl.so.$(TPL_VERSION_MAJOR).$(TPL_VERSION_MINOR) +BIN_NAME = $(SO_NAME).$(TPL_VERSION_PATCH) INST_DIR = $(libdir) CC ?= gcc diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 8cb28a8..df11a41 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -1,9 +1,8 @@ #TPL VERSION MACROS -%define TPL_VER_MAJOR 1 -%define TPL_VER_MINOR 3 -%define TPL_RELEASE 0 -%define TPL_VERSION %{TPL_VER_MAJOR}.%{TPL_VER_MINOR} -%define TPL_VER_FULL %{TPL_VERSION}.%{TPL_RELEASE} +%define TPL_VERSION_MAJOR 1 +%define TPL_VERSION_MINOR 3 +%define TPL_VERSION_PATCH 0 +%define TPL_VERSION %{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR}.%{TPL_VERSION_PATCH} #TPL WINDOW SYSTEM DEFINITION %define TPL_WINSYS WL @@ -21,11 +20,10 @@ %define ENABLE_TPL_TEST 0 #WAYLAND-EGL VERSION MACROS -%define WL_EGL_VER_MAJOR 1 -%define WL_EGL_VER_MINOR 2 -%define WL_EGL_RELEASE 0 -%define WL_EGL_VERSION %{WL_EGL_VER_MAJOR}.%{WL_EGL_VER_MINOR} -%define WL_EGL_VER_FULL %{WL_EGL_VERSION}.%{WL_EGL_RELEASE} +%define WL_EGL_VERSION_MAJOR 1 +%define WL_EGL_VERSION_MINOR 2 +%define WL_EGL_VERSION_PATCH 0 +%define WL_EGL_VERSION %{WL_EGL_VERSION_MAJOR}.%{WL_EGL_VERSION_MINOR}.%{WL_EGL_VERSION_PATCH} #TPL WINDOW SYSTEM CHECK %if "%{TPL_WINSYS}" != "DRI2" && "%{TPL_WINSYS}" != "DRI3" && "%{TPL_WINSYS}" != "WL" @@ -41,7 +39,7 @@ ExclusiveArch: %{arm} aarch64 Name: libtpl-egl Version: %{TPL_VERSION} -Release: %{TPL_RELEASE} +Release: 0 %if "%{TPL_WINSYS}" == "DRI2" Summary: Tizen Porting Layer for EGL (DRI2 backend) %endif @@ -113,12 +111,16 @@ the GPU Vendor DDK's EGL. %if "%{TPL_WINSYS}" == "WL" %package -n libwayland-egl +Version: %{WL_EGL_VERSION} +Release: 0 Summary: Wayland EGL backend %description -n libwayland-egl Wayland EGL backend %package -n libwayland-egl-devel +Version: %{WL_EGL_VERSION} +Release: 0 Summary: Development header files for use with Wayland protocol Requires: libwayland-egl @@ -174,9 +176,9 @@ TPL_OPTIONS=${TPL_OPTIONS}-arm_atomic_operation # do not change the following line export TPL_OPTIONS=${TPL_OPTIONS}- -export TPL_VER_MAJOR=%{TPL_VER_MAJOR} -export TPL_VER_MINOR=%{TPL_VER_MINOR} -export TPL_RELEASE=%{TPL_RELEASE} +export TPL_VERSION_MAJOR=%{TPL_VERSION_MAJOR} +export TPL_VERSION_MINOR=%{TPL_VERSION_MINOR} +export TPL_VERSION_PATCH=%{TPL_VERSION_PATCH} #wayland-vulkan build %if "%{TPL_WINSYS}" == "WL" @@ -190,7 +192,7 @@ make all #libwayland-egl build %if "%{TPL_WINSYS}" == "WL" cd src/wayland-egl -export WL_EGL_SO_VER=%{WL_EGL_VER_FULL} +export WL_EGL_SO_VER=%{WL_EGL_VERSION} make cd ../../ %endif @@ -220,25 +222,25 @@ mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} mkdir -p %{buildroot}%{_libdir}/pkgconfig -export TPL_VER_MAJOR=%{TPL_VER_MAJOR} -export TPL_VER_MINOR=%{TPL_VER_MINOR} -export TPL_RELEASE=%{TPL_RELEASE} +export TPL_VERSION_MAJOR=%{TPL_VERSION_MAJOR} +export TPL_VERSION_MINOR=%{TPL_VERSION_MINOR} +export TPL_VERSION_PATCH=%{TPL_VERSION_PATCH} make install libdir=%{buildroot}%{_libdir} -ln -sf libtpl-egl.so.%{TPL_VER_FULL} %{buildroot}%{_libdir}/libtpl-egl.so.%{TPL_VERSION} -ln -sf libtpl-egl.so.%{TPL_VERSION} %{buildroot}%{_libdir}/libtpl-egl.so.%{TPL_VER_MAJOR} -ln -sf libtpl-egl.so.%{TPL_VER_MAJOR} %{buildroot}%{_libdir}/libtpl-egl.so +ln -sf libtpl-egl.so.%{TPL_VERSION} %{buildroot}%{_libdir}/libtpl-egl.so.%{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR} +ln -sf libtpl-egl.so.%{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR} %{buildroot}%{_libdir}/libtpl-egl.so.%{TPL_VERSION_MAJOR} +ln -sf libtpl-egl.so.%{TPL_VERSION_MAJOR} %{buildroot}%{_libdir}/libtpl-egl.so cp -a src/tpl.h %{buildroot}%{_includedir}/ cp -a pkgconfig/tpl-egl.pc %{buildroot}%{_libdir}/pkgconfig/ %if "%{TPL_WINSYS}" == "WL" cd src/wayland-egl -cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so -cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VER_MAJOR} -cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION} -export WL_EGL_SO_VER=%{WL_EGL_VER_FULL} +cp libwayland-egl.so.%{WL_EGL_VERSION} %{buildroot}%{_libdir}/libwayland-egl.so +cp libwayland-egl.so.%{WL_EGL_VERSION} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION_MAJOR} +cp libwayland-egl.so.%{WL_EGL_VERSION} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION_MAJOR}.%{WL_EGL_VERSION_MINOR} +export WL_EGL_SO_VER=%{WL_EGL_VERSION} %makeinstall cd - @@ -275,9 +277,9 @@ cp -a %{_builddir}/%{buildsubdir}/tc/libs/gtest/googletest/LICENSE %{buildroot}/ %license COPYING %defattr(-,root,root,-) %{_libdir}/libtpl-egl.so -%{_libdir}/libtpl-egl.so.%{TPL_VER_MAJOR} +%{_libdir}/libtpl-egl.so.%{TPL_VERSION_MAJOR} +%{_libdir}/libtpl-egl.so.%{TPL_VERSION_MAJOR}.%{TPL_VERSION_MINOR} %{_libdir}/libtpl-egl.so.%{TPL_VERSION} -%{_libdir}/libtpl-egl.so.%{TPL_VER_FULL} %if "%{ENABLE_WORKER_TEST_ONLY}" == "1" %{_bindir}/worker_test @@ -303,9 +305,9 @@ cp -a %{_builddir}/%{buildsubdir}/tc/libs/gtest/googletest/LICENSE %{buildroot}/ %license COPYING %defattr(-,root,root,-) %{_libdir}/libwayland-egl.so -%{_libdir}/libwayland-egl.so.%{WL_EGL_VER_MAJOR} +%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION_MAJOR} +%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION_MAJOR}.%{WL_EGL_VERSION_MINOR} %{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION} -%{_libdir}/libwayland-egl.so.%{WL_EGL_VER_FULL} %files -n libwayland-egl-devel %defattr(-,root,root,-) diff --git a/tc/Makefile b/tc/Makefile index 938ec88..b17f511 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -34,7 +34,7 @@ GTEST_LIB_PATH := $(GTEST_DIR)/build/gtest/libgtest.a # googletest output path GMOCK_LIB_PATH := $(GTEST_DIR)/build/libgmock.a # googlemock output path # libtpl-egl, libwayland-egl -TPL_LIB_PATH = ../libtpl-egl.so.$(TPL_VER_MAJOR).$(TPL_VER_MINOR).$(TPL_RELEASE) +TPL_LIB_PATH = ../libtpl-egl.so.$(TPL_VERSION_MAJOR).$(TPL_VERSION_MINOR).$(TPL_VERSION_PATCH) WAYLAND_EGL_OBJ_PATH = ../src/wayland-egl/wayland-egl.o -- 2.7.4