From 4bca5b15c21251adf9bdd51384296501b8460697 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Thu, 18 Jul 2019 10:11:05 +0900 Subject: Revert "Create devel file for gbm" This reverts commit 50ab33c2da2203fa2b9905bb273af8838653ac2a. Change-Id: Iefe4be0e99bf67e87d5882fbc15eb2649499ffd7 --- packaging/mesa.spec | 22 +--------------------- pkgconfig/Makefile.am | 2 -- pkgconfig/mesa-libgbm.pc.in | 12 ------------ 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgconfig/Makefile.am delete mode 100644 pkgconfig/mesa-libgbm.pc.in diff --git a/packaging/mesa.spec b/packaging/mesa.spec index 42da079b4be..31cea6fe688 100644 --- a/packaging/mesa.spec +++ b/packaging/mesa.spec @@ -9,12 +9,6 @@ Source: %{name}-%{version}.tar.gz Source1001: %{name}.manifest Source1002: 99-GPU-Acceleration.rules -#GBM VERSION MACROS -%define GBM_VERSION_MAJOR 19 -%define GBM_VERSION_MINOR 1 -%define GBM_VERSION_PATCH 1 -%define GBM_VERSION %{GBM_VERSION_MAJOR}.%{GBM_VERSION_MINOR}.%{GBM_VERSION_PATCH} - BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: bison @@ -44,14 +38,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(libdrm_intel) >= 2.4.24 %endif -%package -n mesa-libgbm-devel -Version: %{GBM_VERSION} -Release: 0 -Summary: Development header files for gbm in mesa. - -%description -n mesa-libgbm-devel -Development header files for gbm in mesa. - %if "%{_with_emulator}" == "1" ExclusiveArch: %endif @@ -72,7 +58,7 @@ just Mesa or The Mesa 3-D graphics library. * OpenGL is a trademark of Silicon Graphics Incorporated. %prep -%setup -q +%setup -q -n %{name}-%{version} cp %{SOURCE1001} . cp %{SOURCE1002} . @@ -110,12 +96,6 @@ cp 99-GPU-Acceleration.rules %{buildroot}/etc/udev/rules.d %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -n mesa-libgbm-devel -%defattr(-,root,root,-) -%{_includedir}/gbm.h -%{_libdir}/libgbm.so -%{_libdir}/pkgconfig/gbm.pc - %files %define _unpackaged_files_terminate_build 0 %manifest %{name}.manifest diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am deleted file mode 100644 index daac171b285..00000000000 --- a/pkgconfig/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = mesa-libgbm.pc diff --git a/pkgconfig/mesa-libgbm.pc.in b/pkgconfig/mesa-libgbm.pc.in deleted file mode 100644 index 61a2a4176fc..00000000000 --- a/pkgconfig/mesa-libgbm.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/@LIB@ -includedir=${prefix}/include - -Name: mesa-libgbm -Description: General Buffer Manager in Mesa -Version: 19.0.0 -Requires.private: -Libs: -L${libdir} -lmesa-libgbm -Libs.private: -Cflags: -I${includedir} -- cgit v1.2.3