From cd59f711e6df1c6f459539bc0201aa139173e47b6d1cc3262c7deeb7c7da451f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 20 Dec 2009 21:49:33 +0000 Subject: [PATCH 1/8] Accepting request 27249 from home:jengelh:branches:games Copy from home:jengelh:branches:games/SDL_image via accept of submit request 27249 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/27249 OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=4 --- SDL_image-1.2.10-repack.tar.bz2 | 3 --- SDL_image-1.2.7-repack.tar.bz2 | 3 +++ SDL_image.changes | 10 ---------- SDL_image.spec | 17 ++++++++--------- ready | 0 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 SDL_image-1.2.10-repack.tar.bz2 create mode 100644 SDL_image-1.2.7-repack.tar.bz2 create mode 100644 ready diff --git a/SDL_image-1.2.10-repack.tar.bz2 b/SDL_image-1.2.10-repack.tar.bz2 deleted file mode 100644 index 3f26124..0000000 --- a/SDL_image-1.2.10-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39ba59eaa5bbbc7d2f4c8d43168664935adedee6b4577d51254806063309df8a -size 310568 diff --git a/SDL_image-1.2.7-repack.tar.bz2 b/SDL_image-1.2.7-repack.tar.bz2 new file mode 100644 index 0000000..776038c --- /dev/null +++ b/SDL_image-1.2.7-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caa0400d621a29f8f5962a1a8eeb583c4bc24802a672fca4833ba92de8826b2f +size 280319 diff --git a/SDL_image.changes b/SDL_image.changes index 5cc5def..9002a0c 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 21 14:23:25 UTC 2009 - prusnak@suse.cz - -- updated to 1.2.10 - * Fixed bug loading multiple images - * Fixed checking for IMG_Init() return value in image loaders - * Added support for uncompressed PCX files - * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs - * Added support for ICO and CUR image files - ------------------------------------------------------------------- Sat Dec 19 22:09:23 CET 2009 - jengelh@medozas.de diff --git a/SDL_image.spec b/SDL_image.spec index 85754a3..a20b5c6 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -1,5 +1,5 @@ # -# spec file for package SDL_image (Version 1.2.10) +# spec file for package SDL_image (Version 1.2.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,12 @@ Name: SDL_image BuildRequires: libSDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_image/ Summary: Simple DirectMedia Layer--Sample Image Loading Library -Version: 1.2.10 -Release: 1 -# removed VisualC.zip, VisualCE.zip, Watcom-OS2.zip, Xcode.tar.gz, Xcode_iPhone.tar.gz from upstream tarball [bnc#508084] +Version: 1.2.7 +Release: 4 +# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508084] Source: %{name}-%{version}-repack.tar.bz2 -Source1: baselibs.conf -License: LGPLv2.1+ +Source2: baselibs.conf +License: LGPL v2.1 or later Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,7 +45,7 @@ Authors: %package -n libSDL_image-1_2-0 Summary: Simple DirectMedia Layer--Sample Image Loading Library Group: System/Libraries -License: LGPLv2.1+ +License: LGPL v2.1 or later Provides: SDL_image = %{version} Obsoletes: SDL_image <= %{version} @@ -61,7 +61,7 @@ Authors: Sam Lantinga %package -n libSDL_image-devel -License: LGPLv2.1+ +License: LGPL v2.1 or later Summary: Libraries, includes and more to develop SDL_image applications Group: Development/Libraries/C and C++ Requires: libSDL_image-1_2-0 = %{version} libSDL-devel @@ -106,6 +106,5 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/SDL %{_libdir}/lib*.so -%{_libdir}/pkgconfig/* %changelog diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 From 08b8daa78784f656aece6760058cb5d7ab8f691c8c5c7a45f7e6b674aa0e6d94 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 21 Dec 2009 14:24:08 +0000 Subject: [PATCH 2/8] 1.2.10 OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=5 --- SDL_image-1.2.10-repack.tar.bz2 | 3 +++ SDL_image-1.2.7-repack.tar.bz2 | 3 --- SDL_image.changes | 10 ++++++++++ SDL_image.spec | 6 +++--- ready | 0 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 SDL_image-1.2.10-repack.tar.bz2 delete mode 100644 SDL_image-1.2.7-repack.tar.bz2 delete mode 100644 ready diff --git a/SDL_image-1.2.10-repack.tar.bz2 b/SDL_image-1.2.10-repack.tar.bz2 new file mode 100644 index 0000000..3f26124 --- /dev/null +++ b/SDL_image-1.2.10-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39ba59eaa5bbbc7d2f4c8d43168664935adedee6b4577d51254806063309df8a +size 310568 diff --git a/SDL_image-1.2.7-repack.tar.bz2 b/SDL_image-1.2.7-repack.tar.bz2 deleted file mode 100644 index 776038c..0000000 --- a/SDL_image-1.2.7-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:caa0400d621a29f8f5962a1a8eeb583c4bc24802a672fca4833ba92de8826b2f -size 280319 diff --git a/SDL_image.changes b/SDL_image.changes index 9002a0c..5cc5def 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 21 14:23:25 UTC 2009 - prusnak@suse.cz + +- updated to 1.2.10 + * Fixed bug loading multiple images + * Fixed checking for IMG_Init() return value in image loaders + * Added support for uncompressed PCX files + * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs + * Added support for ICO and CUR image files + ------------------------------------------------------------------- Sat Dec 19 22:09:23 CET 2009 - jengelh@medozas.de diff --git a/SDL_image.spec b/SDL_image.spec index a20b5c6..cbb8c49 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -22,11 +22,11 @@ Name: SDL_image BuildRequires: libSDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_image/ Summary: Simple DirectMedia Layer--Sample Image Loading Library -Version: 1.2.7 +Version: 1.2.10 Release: 4 -# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508084] +# removed VisualC.zip, VisualCE.zip, Watcom-OS2.zip, Xcode.tar.gz, Xcode_iPhone.tar.gz from upstream tarball [bnc#508084] Source: %{name}-%{version}-repack.tar.bz2 -Source2: baselibs.conf +Source1: baselibs.conf License: LGPL v2.1 or later Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 5d0a7901e9c551aada9ed11431d06e10f8517e4dd5915584f54cf3cb034c28da Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 24 Dec 2009 10:36:44 +0000 Subject: [PATCH 3/8] fix file list OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=6 --- SDL_image.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SDL_image.spec b/SDL_image.spec index cbb8c49..c83c644 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -106,5 +106,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/SDL %{_libdir}/lib*.so +%{_libdir}/pkgconfig/* %changelog From ec8f0a33f5340e28e9ea244b7e2652adec053b30b99ac4c5d522fc73fc4b256b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 10:43:38 +0000 Subject: [PATCH 4/8] checked in OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=7 --- SDL_image-1.2.10-repack.tar.bz2 | 3 --- SDL_image-1.2.7-repack.tar.bz2 | 3 +++ SDL_image.changes | 15 --------------- SDL_image.spec | 6 ++---- ready | 0 5 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 SDL_image-1.2.10-repack.tar.bz2 create mode 100644 SDL_image-1.2.7-repack.tar.bz2 create mode 100644 ready diff --git a/SDL_image-1.2.10-repack.tar.bz2 b/SDL_image-1.2.10-repack.tar.bz2 deleted file mode 100644 index 3f26124..0000000 --- a/SDL_image-1.2.10-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39ba59eaa5bbbc7d2f4c8d43168664935adedee6b4577d51254806063309df8a -size 310568 diff --git a/SDL_image-1.2.7-repack.tar.bz2 b/SDL_image-1.2.7-repack.tar.bz2 new file mode 100644 index 0000000..776038c --- /dev/null +++ b/SDL_image-1.2.7-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caa0400d621a29f8f5962a1a8eeb583c4bc24802a672fca4833ba92de8826b2f +size 280319 diff --git a/SDL_image.changes b/SDL_image.changes index 5cc5def..94a0902 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 21 14:23:25 UTC 2009 - prusnak@suse.cz - -- updated to 1.2.10 - * Fixed bug loading multiple images - * Fixed checking for IMG_Init() return value in image loaders - * Added support for uncompressed PCX files - * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs - * Added support for ICO and CUR image files - -------------------------------------------------------------------- -Sat Dec 19 22:09:23 CET 2009 - jengelh@medozas.de - -- add baselibs.conf as a source - ------------------------------------------------------------------- Wed Oct 7 14:52:28 CEST 2009 - prusnak@suse.cz diff --git a/SDL_image.spec b/SDL_image.spec index c83c644..f63483f 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -22,11 +22,10 @@ Name: SDL_image BuildRequires: libSDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_image/ Summary: Simple DirectMedia Layer--Sample Image Loading Library -Version: 1.2.10 +Version: 1.2.7 Release: 4 -# removed VisualC.zip, VisualCE.zip, Watcom-OS2.zip, Xcode.tar.gz, Xcode_iPhone.tar.gz from upstream tarball [bnc#508084] +# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508084] Source: %{name}-%{version}-repack.tar.bz2 -Source1: baselibs.conf License: LGPL v2.1 or later Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -106,6 +105,5 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/SDL %{_libdir}/lib*.so -%{_libdir}/pkgconfig/* %changelog diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 From 8d7fbc8849b73100b21e42e9d1ac8adef23a024a0bca51f6340ccfca8e816313 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:26:45 +0000 Subject: [PATCH 5/8] converted link to branch OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=8 --- SDL_image-1.2.10-repack.tar.bz2 | 3 +++ SDL_image-1.2.7-repack.tar.bz2 | 3 --- SDL_image.changes | 15 +++++++++++++++ SDL_image.spec | 16 +++++++++------- 4 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 SDL_image-1.2.10-repack.tar.bz2 delete mode 100644 SDL_image-1.2.7-repack.tar.bz2 diff --git a/SDL_image-1.2.10-repack.tar.bz2 b/SDL_image-1.2.10-repack.tar.bz2 new file mode 100644 index 0000000..3f26124 --- /dev/null +++ b/SDL_image-1.2.10-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39ba59eaa5bbbc7d2f4c8d43168664935adedee6b4577d51254806063309df8a +size 310568 diff --git a/SDL_image-1.2.7-repack.tar.bz2 b/SDL_image-1.2.7-repack.tar.bz2 deleted file mode 100644 index 776038c..0000000 --- a/SDL_image-1.2.7-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:caa0400d621a29f8f5962a1a8eeb583c4bc24802a672fca4833ba92de8826b2f -size 280319 diff --git a/SDL_image.changes b/SDL_image.changes index 94a0902..5cc5def 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Dec 21 14:23:25 UTC 2009 - prusnak@suse.cz + +- updated to 1.2.10 + * Fixed bug loading multiple images + * Fixed checking for IMG_Init() return value in image loaders + * Added support for uncompressed PCX files + * Added IMG_Init()/IMG_Quit() to prevent constantly loading and unloading DLLs + * Added support for ICO and CUR image files + +------------------------------------------------------------------- +Sat Dec 19 22:09:23 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + ------------------------------------------------------------------- Wed Oct 7 14:52:28 CEST 2009 - prusnak@suse.cz diff --git a/SDL_image.spec b/SDL_image.spec index f63483f..85754a3 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -1,5 +1,5 @@ # -# spec file for package SDL_image (Version 1.2.7) +# spec file for package SDL_image (Version 1.2.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,11 +22,12 @@ Name: SDL_image BuildRequires: libSDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_image/ Summary: Simple DirectMedia Layer--Sample Image Loading Library -Version: 1.2.7 -Release: 4 -# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508084] +Version: 1.2.10 +Release: 1 +# removed VisualC.zip, VisualCE.zip, Watcom-OS2.zip, Xcode.tar.gz, Xcode_iPhone.tar.gz from upstream tarball [bnc#508084] Source: %{name}-%{version}-repack.tar.bz2 -License: LGPL v2.1 or later +Source1: baselibs.conf +License: LGPLv2.1+ Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +45,7 @@ Authors: %package -n libSDL_image-1_2-0 Summary: Simple DirectMedia Layer--Sample Image Loading Library Group: System/Libraries -License: LGPL v2.1 or later +License: LGPLv2.1+ Provides: SDL_image = %{version} Obsoletes: SDL_image <= %{version} @@ -60,7 +61,7 @@ Authors: Sam Lantinga %package -n libSDL_image-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Libraries, includes and more to develop SDL_image applications Group: Development/Libraries/C and C++ Requires: libSDL_image-1_2-0 = %{version} libSDL-devel @@ -105,5 +106,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_includedir}/SDL %{_libdir}/lib*.so +%{_libdir}/pkgconfig/* %changelog From 8f9316b9a7da6a95d8f1a315963156840b38aa371d843ab2a78046d216cc878e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 5 Jul 2011 00:09:41 +0000 Subject: [PATCH 6/8] Accepting request 75100 from home:jengelh:branches:games - Use %_smp_mflags for parallel building - Strip %clean section (not needed on BS) OBS-URL: https://build.opensuse.org/request/show/75100 OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=9 --- SDL_image.changes | 6 ++++++ SDL_image.spec | 5 +---- ready | 0 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 ready diff --git a/SDL_image.changes b/SDL_image.changes index 5cc5def..3b38af2 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 2 14:51:55 UTC 2011 - jengelh@medozas.de + +- Use %_smp_mflags for parallel building +- Strip %clean section (not needed on BS) + ------------------------------------------------------------------- Mon Dec 21 14:23:25 UTC 2009 - prusnak@suse.cz diff --git a/SDL_image.spec b/SDL_image.spec index 85754a3..1c570ef 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -84,7 +84,7 @@ Authors: %build %configure --disable-static --with-pic -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -94,9 +94,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %postun -n libSDL_image-1_2-0 -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -n libSDL_image-1_2-0 %defattr(-,root,root) %doc CHANGES COPYING README diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 5028ed8bef2337ef2f396fd98353019a2775612e5e00122f5e91daf713c941a8 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 1 Aug 2011 15:36:35 +0000 Subject: [PATCH 7/8] Accepting request 77576 from home:jengelh:bl - Update baselibs.conf to also ship libSDL_image-devel-32bit OBS-URL: https://build.opensuse.org/request/show/77576 OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=10 --- SDL_image.changes | 5 +++++ baselibs.conf | 3 +++ 2 files changed, 8 insertions(+) diff --git a/SDL_image.changes b/SDL_image.changes index 3b38af2..14881c2 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 1 09:37:21 UTC 2011 - jengelh@medozas.de + +- Update baselibs.conf to also ship libSDL_image-devel-32bit + ------------------------------------------------------------------- Sat Jul 2 14:51:55 UTC 2011 - jengelh@medozas.de diff --git a/baselibs.conf b/baselibs.conf index 636ba10..661996f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,6 @@ libSDL_image-1_2-0 provides "SDL_image- = " obsoletes "SDL_image- <= " +libSDL_image-devel + requires -libSDL_image- + requires "libSDL_image-1_2-0- = " From abd0955be8cfb536dc578383d4525ca213c9df7aaa7b34ab4593ec7e13d02fb4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 18 Sep 2011 18:56:07 +0000 Subject: [PATCH 8/8] Accepting request 83174 from home:jengelh:bl - Remove redundant tags/sections from specfile OBS-URL: https://build.opensuse.org/request/show/83174 OBS-URL: https://build.opensuse.org/package/show/games/SDL_image?expand=0&rev=11 --- SDL_image.changes | 5 +++++ SDL_image.spec | 23 ++--------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/SDL_image.changes b/SDL_image.changes index 14881c2..cc8e6f3 100644 --- a/SDL_image.changes +++ b/SDL_image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 17 10:23:01 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Aug 1 09:37:21 UTC 2011 - jengelh@medozas.de diff --git a/SDL_image.spec b/SDL_image.spec index 1c570ef..a612082 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -1,7 +1,7 @@ # -# spec file for package SDL_image (Version 1.2.10) +# spec file for package SDL_image # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: SDL_image @@ -36,12 +35,6 @@ 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. - - -Authors: --------- - Sam Lantinga - %package -n libSDL_image-1_2-0 Summary: Simple DirectMedia Layer--Sample Image Loading Library Group: System/Libraries @@ -54,12 +47,6 @@ 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. - - -Authors: --------- - Sam Lantinga - %package -n libSDL_image-devel License: LGPLv2.1+ Summary: Libraries, includes and more to develop SDL_image applications @@ -73,12 +60,6 @@ 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. - - -Authors: --------- - Sam Lantinga - %prep %setup -q