From e212eb2e277982be8ee504fe8fee58bad10b985e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Voln=C3=BD?= Date: Thu, 22 Aug 2013 19:19:11 +0200 Subject: [PATCH 1/2] =?UTF-8?q?*=20Thu=20Aug=2022=202013=20Karel=20Voln?= =?UTF-8?q?=C3=BD=20=200.6.0-1=20-=20New=20release=20-?= =?UTF-8?q?=20See=20changes.txt=20for=20list=20of=20upstream=20changes=20-?= =?UTF-8?q?=20Adds=20pkgconfig=20file=20(+=20patch=20to=20correct=20path)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + game-music-emu.spec | 18 +++++++++++++----- gme-0.6.0-pc-lib-suffix.patch | 8 ++++++++ sources | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 gme-0.6.0-pc-lib-suffix.patch diff --git a/.gitignore b/.gitignore index 0415fa7..077eb70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /game-music-emu-0.5.5.tbz2 +/game-music-emu-0.6.0.tar.bz2 diff --git a/game-music-emu.spec b/game-music-emu.spec index 82f2278..81305f0 100644 --- a/game-music-emu.spec +++ b/game-music-emu.spec @@ -1,10 +1,11 @@ Name: game-music-emu -Version: 0.5.5 -Release: 5%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Video game music file emulation/playback library License: LGPLv2+ URL: http://code.google.com/p/game-music-emu/ -Source0: http://game-music-emu.googlecode.com/files/%{name}-%{version}.tbz2 +Source0: http://game-music-emu.googlecode.com/files/%{name}-%{version}.tar.bz2 +Patch0: gme-0.6.0-pc-lib-suffix.patch BuildRequires: cmake # needed to build the player @@ -13,6 +14,7 @@ BuildRequires: SDL-devel %package devel Summary: Development files for Game_Music_Emu Requires: %{name}%{?_isa} = %{version} +Requires: pkgconfig %package player Summary: Demo player utilizing Game_Music_Emu @@ -42,8 +44,8 @@ This package contains the demo player for files supported by Game_Music_Emu. %prep %setup -q -# fix install path on systems with lib64 -sed -i -e "s/DESTINATION lib/DESTINATION %{_lib}/" gme/CMakeLists.txt +# fix libgme.pc install path +%patch0 # add install rule for the player echo -e "\ninstall(TARGETS gme_player RUNTIME DESTINATION %{_bindir})" >> player/CMakeLists.txt @@ -78,12 +80,18 @@ cd .. %doc design.txt gme.txt %{_libdir}/libgme.so %{_includedir}/gme/ +%{_libdir}/pkgconfig/libgme.pc %files player %{_bindir}/gme_player %changelog +* Thu Aug 22 2013 Karel Volný 0.6.0-1 +- New release +- See changes.txt for list of upstream changes +- Adds pkgconfig file (+ patch to correct path) + * Sat Aug 03 2013 Fedora Release Engineering - 0.5.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/gme-0.6.0-pc-lib-suffix.patch b/gme-0.6.0-pc-lib-suffix.patch new file mode 100644 index 0000000..5975312 --- /dev/null +++ b/gme-0.6.0-pc-lib-suffix.patch @@ -0,0 +1,8 @@ +--- gme/CMakeLists.txt~ 2012-05-27 22:48:53.000000000 +0200 ++++ gme/CMakeLists.txt 2013-08-22 19:03:39.175649327 +0200 +@@ -159,4 +159,4 @@ + ARCHIVE DESTINATION lib) # DLL platforms + + install(FILES ${EXPORTED_HEADERS} DESTINATION include/gme) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib/pkgconfig) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgme.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) diff --git a/sources b/sources index 578d943..434ea6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94459001a763fb76209a550a03b7949e game-music-emu-0.5.5.tbz2 +b98fafb737bc889dc65e7a8b94bd1bf5 game-music-emu-0.6.0.tar.bz2 From 218b290ff24d0aa4470e56efc48997e1ba1267eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Voln=C3=BD?= Date: Fri, 13 Sep 2013 16:36:02 +0200 Subject: [PATCH 2/2] add virtual provides libgme (bug #1006881) --- game-music-emu.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/game-music-emu.spec b/game-music-emu.spec index 81305f0..3127372 100644 --- a/game-music-emu.spec +++ b/game-music-emu.spec @@ -1,6 +1,7 @@ Name: game-music-emu +Provides: libgme Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Video game music file emulation/playback library License: LGPLv2+ URL: http://code.google.com/p/game-music-emu/ @@ -87,6 +88,9 @@ cd .. %changelog +* Fri Sep 13 2013 Karel Volný 0.6.0-2 +- Add virtual provides libgme (bug #1006881) + * Thu Aug 22 2013 Karel Volný 0.6.0-1 - New release - See changes.txt for list of upstream changes