From 50db7ca6c187814c31e6186ce7127fd4d913fa28dc403d8ab2ea12a5d04477f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Dec 2014 10:33:05 +0000 Subject: [PATCH 1/2] Source URLs/ cleanups OBS-URL: https://build.opensuse.org/package/show/games/SDL_gfx?expand=0&rev=20 --- SDL_gfx-2.0.25.tar.gz | 3 +++ SDL_gfx-2.0.25.tar.xz | 3 --- SDL_gfx.changes | 5 +++++ SDL_gfx.spec | 21 ++++++++++----------- baselibs.conf | 8 ++++---- 5 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 SDL_gfx-2.0.25.tar.gz delete mode 100644 SDL_gfx-2.0.25.tar.xz diff --git a/SDL_gfx-2.0.25.tar.gz b/SDL_gfx-2.0.25.tar.gz new file mode 100644 index 0000000..e8ee794 --- /dev/null +++ b/SDL_gfx-2.0.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0 +size 1760656 diff --git a/SDL_gfx-2.0.25.tar.xz b/SDL_gfx-2.0.25.tar.xz deleted file mode 100644 index 50eadec..0000000 --- a/SDL_gfx-2.0.25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17ef477ac2bb637c082f6eff0bf0cd73d9166395b8c1665b29680b71042b9920 -size 845948 diff --git a/SDL_gfx.changes b/SDL_gfx.changes index ecdac17..af0cb4b 100644 --- a/SDL_gfx.changes +++ b/SDL_gfx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 18 10:16:18 UTC 2014 - jengelh@inai.de + +- Use source URLs. Specfile cleanups. + ------------------------------------------------------------------- Mon Nov 11 03:49:34 UTC 2013 - jengelh@inai.de diff --git a/SDL_gfx.spec b/SDL_gfx.spec index 415b010..4827c4a 100644 --- a/SDL_gfx.spec +++ b/SDL_gfx.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_gfx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -23,12 +23,11 @@ Release: 0 Summary: SDL Graphics Routines for Primitives and Other Support Functions License: Zlib Group: Development/Libraries/X11 -Url: http://www.ferzkopp.net/joomla/content/view/19/14/ +Url: http://cms.ferzkopp.net/index.php/software/13-sdl-gfx -Source: %name-%version.tar.xz +Source: http://downloads.sf.net/sdlgfx/%name-%version.tar.gz Source2: baselibs.conf -BuildRequires: libSDL-devel -BuildRequires: xz +BuildRequires: pkgconfig(sdl) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,8 +39,8 @@ surfaces. %package -n %lname Summary: SDL Graphics Routines for Primitives and Other Support Functions Group: System/Libraries -Provides: SDL_gfx = %{version} -Obsoletes: SDL_gfx < %{version} +Provides: SDL_gfx = %version-%release +Obsoletes: SDL_gfx < %version-%release %description -n %lname The SDL_gfx library evolved out of the SDL_gfxPrimitives code which @@ -84,7 +83,7 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -f %{buildroot}%{_libdir}/*.la +rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -96,8 +95,8 @@ make install DESTDIR=$RPM_BUILD_ROOT %files -n libSDL_gfx-devel %defattr(-,root,root) -%{_includedir}/SDL/ -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/SDL_gfx.pc +%_includedir/SDL/ +%_libdir/lib*.so +%_libdir/pkgconfig/SDL_gfx.pc %changelog diff --git a/baselibs.conf b/baselibs.conf index 1f93e5f..767202b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libSDL_gfx15 - provides "SDL_gfx- = " - obsoletes "SDL_gfx- <= " + provides "SDL_gfx- = " + obsoletes "SDL_gfx- <= " libSDL_gfx-devel - requires -libSDL_gfx- - requires "libSDL_gfx15- = " + requires -libSDL_gfx- + requires "libSDL_gfx15- = " From 2e3ec82ec33e634e03047f7a970c0edd780a902ed2c5a32e0878ebf5b967af76 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Dec 2014 11:13:20 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/games/SDL_gfx?expand=0&rev=21 --- SDL_gfx.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SDL_gfx.spec b/SDL_gfx.spec index 4827c4a..087b717 100644 --- a/SDL_gfx.spec +++ b/SDL_gfx.spec @@ -78,7 +78,9 @@ written in plain C and can be used in C++ code. %setup -q %build -%configure --disable-static --with-pic --disable-mmx +# MMX code has a problem with uninitialized variables; we would only turn it +# on for x86_64 anyway - but that one can use SSE instead. +%configure --disable-static --disable-mmx make %{?_smp_mflags} %install