[waffle] 1.5.0 fixes to make it build

Dave Airlie airlied at fedoraproject.org
Tue Dec 16 03:20:32 UTC 2014


commit 3af37d92d71ab62861563b79d247bc3fd31e36b9
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec 16 13:20:28 2014 +1000

    1.5.0 fixes to make it build

 rev-92116dae.patch |   30 ------------------------------
 waffle.spec        |   26 ++------------------------
 2 files changed, 2 insertions(+), 54 deletions(-)
---
diff --git a/waffle.spec b/waffle.spec
index 759a84e..b784b9a 100644
--- a/waffle.spec
+++ b/waffle.spec
@@ -13,8 +13,6 @@ Group:         Development/Libraries
 License:       MIT
 URL:           http://people.freedesktop.org/~chadversary/waffle/releases.html
 Source0:       http://people.freedesktop.org/~chadversary/%{name}/files/release/%{name}-%{version}/%{name}-%{version}.tar.xz
-# For cmake < 2.8.12 we need to patch out 92116dae commit.
-Patch0:        rev-92116dae.patch
 
 BuildRequires: cmake libxslt docbook-style-xsl libxcb-devel
 BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel
@@ -26,6 +24,8 @@ BuildRequires: systemd-devel
 BuildRequires: wayland-devel libwayland-client-devel mesa-libwayland-egl-devel
 %endif
 
+Obsoletes: waffle-examples < 1.5.0
+
 %description
 Waffle is a cross-platform C library that allows one to defer
 selection of GL API and of window system until runtime.
@@ -49,20 +49,9 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 Contains HTML version of the developer documentation for development of
 %{name}-related software (manpages are in the -devel package).
 
-%package examples
-Summary:    Example programs using %{name}
-Group:      Development/Tools
-Requires:   %{name}%{?_isa} = %{version}-%{release}
-
-%description examples
-Example programs using %{name}.
-
 
 %prep
 %setup -q
-%if 0%{?fedora} <= 21 || 0%{?rhel} != 0
-%patch0 -p1
-%endif
 
 
 %build
@@ -83,13 +72,6 @@ make install DESTDIR=%{buildroot}
 # install there anyway.
 rm -rf %{buildroot}%{_docdir}/%{name}*
 
-# Move examples to _libdir
-install -d %{buildroot}%{_libdir}/%{name}-examples
-chrpath -d examples/{gl_basic,simple-x11-egl}
-install -p examples/{gl_basic,simple-x11-egl} \
-    %{buildroot}%{_libdir}/%{name}-examples
-
-
 %postun -p /sbin/ldconfig
 
 
@@ -113,10 +95,6 @@ install -p examples/{gl_basic,simple-x11-egl} \
 %{_mandir}/man*/*
 
 
-%files examples
-%{_libdir}/%{name}-examples/*
-
-
 %changelog
 * Tue Dec 16 2014 Dave Airlie <airlied at redhat.com> 1.5.0-1
 - 1.5.0 release


More information about the scm-commits mailing list