[packages/game-music-emu] - updated to 0.6.1 - removed obsolete multilib patch

qboosh qboosh at pld-linux.org
Tue Jun 6 20:59:35 CEST 2017


commit c29759e90cd89e127e91a78bb0458ae4ecd4f196
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 6 21:00:41 2017 +0200

    - updated to 0.6.1
    - removed obsolete multilib patch

 game-music-emu-multilib.patch |  8 --------
 game-music-emu.spec           | 23 ++++++++---------------
 2 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/game-music-emu.spec b/game-music-emu.spec
index e5603d0..14d6a4c 100644
--- a/game-music-emu.spec
+++ b/game-music-emu.spec
@@ -1,17 +1,17 @@
 Summary:	Collection of video game music file emulators
 Summary(pl.UTF-8):	Zbiór emulatorów do odtwarzania muzyki z gier
 Name:		game-music-emu
-Version:	0.6.0
-Release:	2
+Version:	0.6.1
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 #Source0Download: https://bitbucket.org/mpyne/game-music-emu/downloads
 Source0:	https://bitbucket.org/mpyne/game-music-emu/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	b98fafb737bc889dc65e7a8b94bd1bf5
-Patch0:		%{name}-multilib.patch
+# Source0-md5:	d399f4a00aece2813e777dface2b6aab
 URL:		https://bitbucket.org/mpyne/game-music-emu/wiki/Home
 BuildRequires:	cmake >= 2.6
 BuildRequires:	libstdc++-devel
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,25 +63,18 @@ wykorzystujących bibliotekę game-music-emu.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DLIB_INSTALL_DIR=%{_libdir} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-	-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-	-DCMAKE_VERBOSE_MAKEFILE=ON
+install -d build
+cd build
+%cmake ..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
diff --git a/game-music-emu-multilib.patch b/game-music-emu-multilib.patch
deleted file mode 100644
index 24770bc..0000000
--- a/game-music-emu-multilib.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- game-music-emu-0.6.0/gme/CMakeLists.txt.orig	2012-05-27 22:48:53.000000000 +0200
-+++ game-music-emu-0.6.0/gme/CMakeLists.txt	2013-09-28 17:04:29.820592870 +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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/game-music-emu.git/commitdiff/c29759e90cd89e127e91a78bb0458ae4ecd4f196



More information about the pld-cvs-commit mailing list