From c6bc81b76b70c714111a51d13338f08b6171f674b5c1ab4f7bc01a7217bb7ec3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Nov 2013 03:57:28 +0000 Subject: [PATCH 1/5] Set RPM groups OBS-URL: https://build.opensuse.org/package/show/games/SDL_net?expand=0&rev=15 --- SDL_net.changes | 5 +++++ SDL_net.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/SDL_net.changes b/SDL_net.changes index cf9a6bb..b3e5ab3 100644 --- a/SDL_net.changes +++ b/SDL_net.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 11 03:57:08 UTC 2013 - jengelh@inai.de + +- Set RPM groups to the same values as on the main SDL packages + ------------------------------------------------------------------- Tue Aug 13 12:04:26 UTC 2013 - jengelh@inai.de diff --git a/SDL_net.spec b/SDL_net.spec index 1e4f312..b79d22f 100644 --- a/SDL_net.spec +++ b/SDL_net.spec @@ -22,7 +22,7 @@ Version: 1.2.8 Release: 0 Summary: Simple DirectMedia Layer - Networking Library License: LGPL-2.1+ -Group: Development/Libraries/C and C++ +Group: Development/Libraries/X11 Url: http://libsdl.org/projects/SDL_net/release-1.2.html # removed VisualC, Xcode, Xcode-iOS and Watcom-OS2.zip from the upstream tarball [bnc#508084] @@ -46,7 +46,7 @@ This is a small cross-platform networking library for use with SDL. %package -n libSDL_net-devel Summary: Simple DirectMedia Layer - Networking Library -Group: Development/Libraries/C and C++ +Group: Development/Libraries/X11 Requires: %lname = %{version} Requires: libSDL-devel Provides: SDL_net-devel = %{version} From d8f1cc95305ac83530541367d6c1ab21165bfa6f4b36cf5d45fccffa8f3ef20f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Nov 2013 04:17:12 +0000 Subject: [PATCH 2/5] Main package (SDL2_net) is marked C++, not X11 OBS-URL: https://build.opensuse.org/package/show/games/SDL_net?expand=0&rev=16 --- SDL_net.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL_net.spec b/SDL_net.spec index b79d22f..1e4f312 100644 --- a/SDL_net.spec +++ b/SDL_net.spec @@ -22,7 +22,7 @@ Version: 1.2.8 Release: 0 Summary: Simple DirectMedia Layer - Networking Library License: LGPL-2.1+ -Group: Development/Libraries/X11 +Group: Development/Libraries/C and C++ Url: http://libsdl.org/projects/SDL_net/release-1.2.html # removed VisualC, Xcode, Xcode-iOS and Watcom-OS2.zip from the upstream tarball [bnc#508084] @@ -46,7 +46,7 @@ This is a small cross-platform networking library for use with SDL. %package -n libSDL_net-devel Summary: Simple DirectMedia Layer - Networking Library -Group: Development/Libraries/X11 +Group: Development/Libraries/C and C++ Requires: %lname = %{version} Requires: libSDL-devel Provides: SDL_net-devel = %{version} From b35eec836570e0e48f748c127c2fed77aba739e337c4969a3d3e87a7de77777b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Nov 2013 22:00:18 +0000 Subject: [PATCH 3/5] Remove last changelog entry: when using `osc linkdiff` to check against Factory, there are no changes left besides for the edit in .changes; therefore, revert the .changes edit OBS-URL: https://build.opensuse.org/package/show/games/SDL_net?expand=0&rev=17 --- SDL_net.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SDL_net.changes b/SDL_net.changes index b3e5ab3..cf9a6bb 100644 --- a/SDL_net.changes +++ b/SDL_net.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 11 03:57:08 UTC 2013 - jengelh@inai.de - -- Set RPM groups to the same values as on the main SDL packages - ------------------------------------------------------------------- Tue Aug 13 12:04:26 UTC 2013 - jengelh@inai.de From d95df7831533c7ac78869d2d6cc6d30b836a9721466435e4e5743693581bb19f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 09:33:18 +0000 Subject: [PATCH 4/5] Remove redundant requires OBS-URL: https://build.opensuse.org/package/show/games/SDL_net?expand=0&rev=18 --- SDL_net.changes | 6 ++++++ SDL_net.spec | 42 ++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/SDL_net.changes b/SDL_net.changes index cf9a6bb..f067268 100644 --- a/SDL_net.changes +++ b/SDL_net.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 8 09:32:15 UTC 2015 - jengelh@inai.de + +- Improve package summary and description. Drop --with-pic which + is enabled implicitly anyway, remove redundant Requires. + ------------------------------------------------------------------- Tue Aug 13 12:04:26 UTC 2013 - jengelh@inai.de diff --git a/SDL_net.spec b/SDL_net.spec index 1e4f312..0482aca 100644 --- a/SDL_net.spec +++ b/SDL_net.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_net # -# 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,37 +20,36 @@ Name: SDL_net %define lname libSDL_net-1_2-0 Version: 1.2.8 Release: 0 -Summary: Simple DirectMedia Layer - Networking Library +Summary: SDL networking library License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://libsdl.org/projects/SDL_net/release-1.2.html # removed VisualC, Xcode, Xcode-iOS and Watcom-OS2.zip from the upstream tarball [bnc#508084] -Source: %{name}-%{version}-repack.tar.bz2 +Source: %name-%version-repack.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libSDL-devel -BuildRequires: pkgconfig +BuildRequires: pkg-config +BuildRequires: pkgconfig(sdl) %description This is a small cross-platform networking library for use with SDL. %package -n %lname -Summary: Simple DirectMedia Layer - Networking Library +Summary: Simple DirectMedia Layer – Networking Library Group: System/Libraries -Provides: SDL_net = %{version} -Obsoletes: SDL_net <= %{version} +Provides: SDL_net = %version +Obsoletes: SDL_net <= %version %description -n %lname This is a small cross-platform networking library for use with SDL. %package -n libSDL_net-devel -Summary: Simple DirectMedia Layer - Networking Library +Summary: Development files for the SDL networking library Group: Development/Libraries/C and C++ -Requires: %lname = %{version} -Requires: libSDL-devel -Provides: SDL_net-devel = %{version} -Obsoletes: SDL_net-devel <= %{version} +Requires: %lname = %version +Provides: SDL_net-devel = %version +Obsoletes: SDL_net-devel <= %version %description -n libSDL_net-devel This is a small cross-platform networking library for use with SDL. @@ -59,26 +58,25 @@ This is a small cross-platform networking library for use with SDL. %setup -q %build -%configure --disable-static --with-pic +%configure --disable-static make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -%{__rm} -f %{buildroot}%{_libdir}/*.la - -%post -n %lname -p /sbin/ldconfig +%make_install +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 COPYING README -%{_libdir}/libSDL_net-1*.so.* +%_libdir/libSDL_net-1*.so.* %files -n libSDL_net-devel %defattr(-,root,root) -%{_includedir}/SDL/ -%{_libdir}/libSDL_net.so -%{_libdir}/pkgconfig/SDL_net.pc +%_includedir/SDL/ +%_libdir/libSDL_net.so +%_libdir/pkgconfig/SDL_net.pc %changelog From baca3eb887065a25897ab3a64b823cbaec2a1bc5437d9d32d4ae60e221888a2f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 Jan 2015 14:12:55 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/games/SDL_net?expand=0&rev=19 --- SDL_net.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL_net.spec b/SDL_net.spec index 0482aca..66cd7c0 100644 --- a/SDL_net.spec +++ b/SDL_net.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(sdl) This is a small cross-platform networking library for use with SDL. %package -n %lname -Summary: Simple DirectMedia Layer – Networking Library +Summary: Simple DirectMedia Layer – Networking library Group: System/Libraries Provides: SDL_net = %version Obsoletes: SDL_net <= %version