From 635e136155d3164175b6625520018e7c356491c8 Mon Sep 17 00:00:00 2001 From: Moez Roy Date: Fri, 3 Oct 2014 16:32:04 -0700 Subject: [PATCH] sync with master branch --- .gitignore | 1 + game-music-emu.spec | 44 +++++++++++++++++++++++++++++++---- gme-0.6.0-pc-lib-suffix.patch | 8 +++++++ sources | 2 +- 4 files changed, 49 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 8dea204..97d85b5 100644 --- a/game-music-emu.spec +++ b/game-music-emu.spec @@ -1,10 +1,12 @@ Name: game-music-emu -Version: 0.5.5 -Release: 1%{?dist} +Version: 0.6.0 +Release: 5%{?dist} +Provides: libgme%{?_isa} = %{version}-%{release} 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 @@ -12,7 +14,9 @@ BuildRequires: SDL-devel %package devel Summary: Development files for Game_Music_Emu +Provides: libgme-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version} +Requires: pkgconfig %package player Summary: Demo player utilizing Game_Music_Emu @@ -42,8 +46,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,11 +82,41 @@ cd .. %doc design.txt gme.txt %{_libdir}/libgme.so %{_includedir}/gme/ +%{_libdir}/pkgconfig/libgme.pc %files player %{_bindir}/gme_player %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Sep 20 2013 Karel Volný 0.6.0-3 +- Adjust virtual provides according to further comments on bug#1006881 + +* 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 +- 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 + +* Wed Feb 13 2013 Fedora Release Engineering - 0.5.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 24 2011 Karel Volny 0.5.5-1 - Initial release for Fedora 15 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