- updated to 0.6.1

- removed obsolete multilib patch

diff --git a/game-music-emu-multilib.patch b/game-music-emu-multilib.patch
deleted file mode 100644 (file)
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)

diff --git a/game-music-emu.spec b/game-music-emu.spec
index e5603d00cfc509a43512b465d2fabb122736df76..14d6a4c4c5efdf009e40715e82a457a5b5792608 100644 (file)
--- 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