[jack-keyboard] Update to 2.7.1

[Orcan Ogetbil]

commit d8db85fb6ba68033541c8a73b1b2f9e9ae110a71
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Jun 13 00:26:33 2012 -0400

    Update to 2.7.1
    
    - Specfile cleanup
    - Drop upstreamed Dvorak patch

 .gitignore                      |    1 +
 jack-keyboard-dso-linking.patch |   23 +++++++++
 jack-keyboard-dvorak.patch      |  101 ---------------------------------------
 jack-keyboard.spec              |   42 ++++++++--------
 sources                         |    2 +-
 5 files changed, 46 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5672dae..49fca2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 jack-keyboard-2.5.tar.gz
+/jack-keyboard-2.7.1.tar.gz
diff --git a/jack-keyboard-dso-linking.patch b/jack-keyboard-dso-linking.patch
new file mode 100644
index 0000000..ccd29af
--- /dev/null
+++ b/jack-keyboard-dso-linking.patch
@@ -0,0 +1,23 @@
+diff -rupN jack-keyboard-2.7.1.old/CMakeLists.txt jack-keyboard-2.7.1/CMakeLists.txt
+--- jack-keyboard-2.7.1.old/CMakeLists.txt	2011-12-27 04:50:32.000000000 -0500
++++ jack-keyboard-2.7.1/CMakeLists.txt	2012-06-13 00:09:44.009221984 -0400
+@@ -26,6 +26,7 @@
+ # Makefile for Jack Keyboard
+ #
+ cmake_minimum_required(VERSION 2.8)
++include(FindPkgConfig)
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
+ set(VERSION "2.7.1")
+@@ -39,8 +40,9 @@ project(jack-keyboard)
+ add_executable(jack-keyboard src/jack-keyboard src/pianokeyboard)
+ 
+ find_package(GTK2 2.2 REQUIRED gtk)
+-include_directories(${GTK2_INCLUDE_DIRS})
+-target_link_libraries(jack-keyboard ${GTK2_LIBRARIES})
++pkg_check_modules(GTHREAD2 REQUIRED gthread-2.0)
++include_directories(${GTK2_INCLUDE_DIRS} ${GTHREAD2_INCLUDE_DIRS})
++target_link_libraries(jack-keyboard ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
+ 
+ if(JackEnable)
+ find_package(JACK)
diff --git a/jack-keyboard.spec b/jack-keyboard.spec
index e8fd933..8a52fae 100644
--- a/jack-keyboard.spec
+++ b/jack-keyboard.spec
@@ -1,18 +1,17 @@
 Name:		jack-keyboard
-Version:	2.5
-Release:	8%{?dist}
+Version:	2.7.1
+Release:	1%{?dist}
 Summary:	Virtual keyboard for JACK MIDI
 Group:		Applications/Multimedia
 License:	BSD
-URL:		http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/
-Source0:	http://pin.if.uz.zgora.pl/~trasz/%{name}/%{name}-%{version}.tar.gz
+URL:		http://sourceforge.net/projects/jack-keyboard/
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Icon is derived from the image on the website:
 Source1:	%{name}.png
-# Add support for Dvorak keyboard. Patch sent upstream via email
-# (no bugtracker):
-Patch0:		%{name}-dvorak.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Upstreamable patch. Fix DSO linking
+Patch0: 	%{name}-dso-linking.patch
 
+BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
 BuildRequires:	jack-audio-connection-kit-devel
@@ -27,22 +26,24 @@ so you have two and half octaves under your fingers.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dvorak
+%patch0 -p1 -b .dso.linking
 
 # Add GenericName to the desktop file
 echo "GenericName=Virtual MIDI Keyboard" >> src/%{name}.desktop
 
-# To suppress d-f-i warning
-sed -i 's|\.png||' src/%{name}.desktop
+# Fix man dir
+sed -i 's|man/man1|%{_mandir}/man1|' CMakeLists.txt
 
 %build
-%configure
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
 
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/
@@ -51,7 +52,6 @@ install -pm 644	%{SOURCE1} \
 
 desktop-file-install						\
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
-	--remove-category=Application				\
 	--add-category=X-Jack					\
 	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
@@ -69,12 +69,7 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
@@ -83,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 12 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.7.1-1
+- Update to 2.7.1
+- Specfile cleanup
+- Drop upstreamed Dvorak patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 6d72885..f648c29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-030a666f1703ef1ab3eae6004cb04a9a  jack-keyboard-2.5.tar.gz
+b89c9ac03e850ad1aa8b33ff62ea06a8  jack-keyboard-2.7.1.tar.gz