- added format patch (fixes build with -Werror=format-security)

[packages/portmidi.git] / portmidi.spec

diff --git a/portmidi.spec b/portmidi.spec
index 3dffbadb369bd46e1a708581fe295cbf2f1b8bfc..5f5a86740b11d0ce6d9abef257d94c2f0697a844 100644 (file)
--- a/portmidi.spec
+++ b/portmidi.spec
@@ -12,10 +12,10 @@ Source0:    http://downloads.sourceforge.net/portmedia/%{version}/%{name}-src-%{ver
 # Source0-md5: 03f46fd3947e2ef4c8c465baaf832241
 Source1:       pmdefaults.desktop
 Patch0:                %{name}-cmake.patch
+Patch1:                %{name}-format.patch
 URL:           http://portmedia.sourceforge.net/
 BuildRequires: alsa-lib-devel >= 0.9
-BuildRequires: cmake
-BuildRequires: desktop-file-utils
+BuildRequires: cmake >= 2.6
 #BuildRequires:        doxygen
 BuildRequires: jdk >= 1.5
 BuildRequires: jpackage-utils
@@ -39,6 +39,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki PortMidi
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      alsa-lib-devel >= 0.9
+Obsoletes:     portmidi-static
 
 %description devel
 Header files for PortMidi library.
@@ -51,7 +52,7 @@ Summary:      Tools to configure and use portmidi
 Summary(pl.UTF-8):     Narzędzia do konfiguracji i używania portmidi
 Group:         Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
-Requires:      jdk >= 1.5
+Requires:      jre >= 1.5
 Requires:      jpackage-utils
 
 %description tools
@@ -63,6 +64,7 @@ Narzędzia do konfiguracji i używania portmidi.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 # Add shebang, lib and class path
 %{__sed} -i -e 's|^java|#!/bin/sh\njava \\\
@@ -83,8 +85,7 @@ export JAVA_HOME=%{java_home}
 %if 0
 # Build the doxygen documentation
 doxygen
-cd latex
-%{__make}
+%{__make} -C latex
 %endif
 
 %install
@@ -96,7 +97,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_datadir}/icons/hicolor/128x128/
 
 # Install the test applications
 for app in latency midiclock midithread midithru mm qtest sysex test; do
-       install build/Release/$app $RPM_BUILD_ROOT%{_libdir}/%{name}
+       install build/PLD/$app $RPM_BUILD_ROOT%{_libdir}/%{name}
 done
 
 # PLD's jni library location is different
@@ -105,10 +106,10 @@ mv $RPM_BUILD_ROOT%{_javadir}/pmdefaults.jar $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 # pmdefaults icon
 cp -a pm_java/pmdefaults/pmdefaults-icon.png \
-   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+       $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 
 # desktop file
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_desktopdir} %{SOURCE1}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 # remove duplicate library
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libportmidi_s.so