From 978b3fc52c6cda3e39f6a81ada3aa09cdda1233d636b693e6a3537068966ad55 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:02:38 +0000 Subject: [PATCH 1/4] Edit package summary and description. Drop --with-pic. OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=11 --- SDL2_image.changes | 6 ++++++ SDL2_image.spec | 40 ++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/SDL2_image.changes b/SDL2_image.changes index 603ab6b..9e569e9 100644 --- a/SDL2_image.changes +++ b/SDL2_image.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 6 12:00:16 UTC 2015 - jengelh@inai.de + +- Improve package summary and description +- Drop --with-pic which is enabled anyway + ------------------------------------------------------------------- Thu Sep 12 10:42:27 UTC 2013 - dvaleev@suse.com diff --git a/SDL2_image.spec b/SDL2_image.spec index 9101ce5..ee03195 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -1,7 +1,7 @@ # # spec file for package SDL2_image # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: SDL2_image %define lname libSDL2_image-2_0-0 Version: 2.0.0 Release: 0 -Summary: Simple DirectMedia Layer--Sample Image Loading Library +Summary: SDL2 image loading library License: Zlib Group: Development/Libraries/X11 Url: http://libsdl.org/projects/SDL_image/ @@ -28,13 +28,13 @@ Url: http://libsdl.org/projects/SDL_image/ #Hg-Clone: http://hg.libsdl.org/SDL_image/ Source: http://libsdl.org/projects/SDL_image/release/%name-%version.tar.gz Source2: baselibs.conf -Patch0: bigendian_undefined_s.patch -BuildRequires: libSDL2-devel +Patch1: bigendian_undefined_s.patch BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(sdl2) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,9 +43,9 @@ surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats. %package -n %lname -Summary: Simple DirectMedia Layer--Sample Image Loading Library +Summary: Simple DirectMedia Layer 2 - Image Loading Library Group: System/Libraries -Provides: SDL2_image = %{version} +Provides: SDL2_image = %version-%release %description -n %lname This is a simple library to load images of various formats as SDL @@ -53,43 +53,43 @@ surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats. %package -n libSDL2_image-devel -Summary: Libraries, includes and more to develop SDL_image applications +Summary: Development files for the SDL2 image loader library Group: Development/Libraries/X11 -Requires: %lname = %{version} +Requires: %lname = %version Requires: libSDL2-devel -Provides: SDL2_image-devel = %{version} +Provides: SDL2_image-devel = %version-%release %description -n libSDL2_image-devel This is a simple library to load images of various formats as SDL -surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF -formats. +surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, TIFF +and WEBP formats. %prep %setup -q -%patch0 -p1 +%patch -P 1 -p1 rm -rf external %build -%configure --disable-png-shared --disable-jpg-shared --disable-tif-shared --disable-webp-shared --disable-static --with-pic +%configure --disable-png-shared --disable-jpg-shared --disable-tif-shared \ + --disable-webp-shared --disable-static make %{?_smp_mflags} %install make install DESTDIR="%buildroot" -rm -f %{buildroot}%{_libdir}/*.la - -%post -n %lname -p /sbin/ldconfig +rm -f "%buildroot/%_libdir"/*.la +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %doc CHANGES.txt COPYING.txt README.txt -%{_libdir}/libSDL2_image-2*.so.* +%_libdir/libSDL2_image-2*.so.* %files -n libSDL2_image-devel %defattr(-,root,root) -%{_includedir}/SDL2/ -%{_libdir}/libSDL2_image.so -%{_libdir}/pkgconfig/SDL2_image.pc +%_includedir/SDL2/ +%_libdir/libSDL2_image.so +%_libdir/pkgconfig/SDL2_image.pc %changelog From 8bdcf850e339b78668f8347f1c641606a7944fb4bc330f6a33dfac9e156e78ea Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 6 Jan 2015 12:04:53 +0000 Subject: [PATCH 2/4] descriptions OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=12 --- SDL2_image.changes | 2 +- SDL2_image.spec | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SDL2_image.changes b/SDL2_image.changes index 9e569e9..23369ac 100644 --- a/SDL2_image.changes +++ b/SDL2_image.changes @@ -2,7 +2,7 @@ Tue Jan 6 12:00:16 UTC 2015 - jengelh@inai.de - Improve package summary and description -- Drop --with-pic which is enabled anyway +- Drop --with-pic which is enabled implicitly anyway ------------------------------------------------------------------- Thu Sep 12 10:42:27 UTC 2013 - dvaleev@suse.com diff --git a/SDL2_image.spec b/SDL2_image.spec index ee03195..4e07d75 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -39,18 +39,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a simple library to load images of various formats as SDL -surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF -formats. +surfaces. This library supports the BMP, PPM, PCX, GIF, JPEG, PNG, +TIFF and WEBP formats. %package -n %lname -Summary: Simple DirectMedia Layer 2 - Image Loading Library +Summary: Simple DirectMedia Layer 2 – Image Loading Library Group: System/Libraries Provides: SDL2_image = %version-%release %description -n %lname This is a simple library to load images of various formats as SDL -surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF -formats. +surfaces. This library supports the BMP, PPM, PCX, GIF, JPEG, PNG, +TIFF and WEBP formats. %package -n libSDL2_image-devel Summary: Development files for the SDL2 image loader library @@ -61,8 +61,8 @@ Provides: SDL2_image-devel = %version-%release %description -n libSDL2_image-devel This is a simple library to load images of various formats as SDL -surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, TIFF -and WEBP formats. +surfaces. This library supports the BMP, PPM, PCX, GIF, JPEG, PNG, +TIFF and WEBP formats. %prep %setup -q From 9dec91d26605da8d1a796aad4f664cef3bb6c9a8c08427019cbd6cb04272431c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:14:56 +0000 Subject: [PATCH 3/4] pkgconfig's real name is pkg-config OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=13 --- SDL2_image.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2_image.spec b/SDL2_image.spec index 4e07d75..b3eac48 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -31,7 +31,7 @@ Source2: baselibs.conf Patch1: bigendian_undefined_s.patch BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(sdl2) From 71c8b7375abdeed95a44edf89c3a9c7d245f8e74bd8ac5d25469312534a66fff Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:35:06 +0000 Subject: [PATCH 4/4] Remove redundant requires OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=14 --- SDL2_image.changes | 6 +++--- SDL2_image.spec | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SDL2_image.changes b/SDL2_image.changes index 23369ac..a4b91f6 100644 --- a/SDL2_image.changes +++ b/SDL2_image.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Tue Jan 6 12:00:16 UTC 2015 - jengelh@inai.de +Thu Jan 8 09:34:57 UTC 2015 - jengelh@inai.de -- Improve package summary and description -- Drop --with-pic which is enabled implicitly anyway +- Improve package summary and description. Drop --with-pic which + is enabled implicitly anyway, remove redundant Requires. ------------------------------------------------------------------- Thu Sep 12 10:42:27 UTC 2013 - dvaleev@suse.com diff --git a/SDL2_image.spec b/SDL2_image.spec index b3eac48..d4a282c 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -56,7 +56,6 @@ TIFF and WEBP formats. Summary: Development files for the SDL2 image loader library Group: Development/Libraries/X11 Requires: %lname = %version -Requires: libSDL2-devel Provides: SDL2_image-devel = %version-%release %description -n libSDL2_image-devel