From ee03013f94cd1aaf3431125264bc7ca9f44589c1bea349b99cc09ec22a4e58ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 13:51:54 +0000 Subject: [PATCH] Accepting request 581170 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581170 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtkglext?expand=0&rev=8 --- gtkglext.changes | 5 +++++ gtkglext.spec | 25 +++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gtkglext.changes b/gtkglext.changes index 49027cf..f769f55 100644 --- a/gtkglext.changes +++ b/gtkglext.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:32:33 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Thu Jun 29 10:48:08 UTC 2017 - jengelh@inai.de diff --git a/gtkglext.spec b/gtkglext.spec index 3d6b45b..7ed7bac 100644 --- a/gtkglext.spec +++ b/gtkglext.spec @@ -1,7 +1,7 @@ # # spec file for package gtkglext # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,15 @@ # -Name: gtkglext %define git_commit 8c13cc48 %define git_date 20110529 +Name: gtkglext Version: 1.2.0git%{git_date} Release: 0 Summary: OpenGL Extension to GTK -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Url: http://projects.gnome.org/gtkglext/ +URL: http://projects.gnome.org/gtkglext/ # git clone git://git.gnome.org/gtkglext # git archive %{git_commit} --prefix=gtkglext-git%{git_date}/ | bzip2 > ../gtkglext-git%{git_date}.tar.bz2 Source: %{name}-git%{git_date}.tar.bz2 @@ -36,8 +36,8 @@ BuildRequires: freeglut-devel BuildRequires: gtk-doc BuildRequires: libdrm-devel BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: pkgconfig(gtk+-2.0) >= 2.20 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GtkGLExt is an OpenGL extension to GTK. It provides the GDK objects @@ -46,7 +46,7 @@ GTK+ widgets OpenGL-capable. %package -n libgtkglext-x11-1_0-0 Summary: OpenGL Extension to GTK -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -58,7 +58,7 @@ GTK+ widgets OpenGL-capable. %package devel Summary: OpenGL Extension to GTK -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: Mesa-devel Requires: libgtkglext-x11-1_0-0 = %{version} @@ -73,7 +73,7 @@ make GTK+ widgets OpenGL-capable. %package doc Summary: Documentation of the OpenGL Extension to GTK -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Documentation/HTML Requires: libgtkglext-x11-1_0-0 = %{version} @@ -96,21 +96,19 @@ make %{?_smp_mflags} %install %make_install -rm -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %post -n libgtkglext-x11-1_0-0 -p /sbin/ldconfig - %postun -n libgtkglext-x11-1_0-0 -p /sbin/ldconfig %files -n libgtkglext-x11-1_0-0 -%defattr (-, root, root) # NEWS is empty -%doc AUTHORS COPYING COPYING.LIB README TODO +%license COPYING +%doc AUTHORS README TODO %{_libdir}/libgdkglext-x11-1.0.so.* %{_libdir}/libgtkglext-x11-1.0.so.* %files devel -%defattr (-, root, root) # %{_datadir}/aclocal/gtkglext-1.0.m4 %{_libdir}/gtkglext-1.0/ %{_libdir}/libgdkglext-x11-1.0.so @@ -122,7 +120,6 @@ rm -f %{buildroot}%{_libdir}/*.la %{_includedir}/gtkglext-1.0/ %files doc -%defattr (-, root, root) %doc %{_datadir}/gtk-doc/html/gtkglext/ %changelog