packages: portmidi/portmidi.spec - Obsoletes for withdrawn -static package ...

[qboosh]

Author: qboosh                       Date: Sat Jan 29 13:18:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Obsoletes for withdrawn -static package
- jre should be sufficient for -tools
- use plain install instead of desktop-file- to install .desktop

---- Files affected:
packages/portmidi:
   portmidi.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/portmidi/portmidi.spec
diff -u packages/portmidi/portmidi.spec:1.16 packages/portmidi/portmidi.spec:1.17
--- packages/portmidi/portmidi.spec:1.16	Sat Jan 29 01:35:33 2011
+++ packages/portmidi/portmidi.spec	Sat Jan 29 14:18:44 2011
@@ -15,8 +15,7 @@
 Patch0:		%{name}-cmake.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
@@ -40,6 +39,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	alsa-lib-devel >= 0.9
+Obsoletes:	portmidi-static
 
 %description devel
 Header files for PortMidi library.
@@ -52,7 +52,7 @@
 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
@@ -84,8 +84,7 @@
 %if 0
 # Build the doxygen documentation
 doxygen
-cd latex
-%{__make}
+%{__make} -C latex
 %endif
 
 %install
@@ -106,10 +105,10 @@
 
 # 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
@@ -156,6 +155,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/01/29 13:18:44  qboosh
+- Obsoletes for withdrawn -static package
+- jre should be sufficient for -tools
+- use plain install instead of desktop-file- to install .desktop
+
 Revision 1.16  2011/01/29 00:35:33  sparky
 - avoid g++ requirement
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/portmidi/portmidi.spec?r1=1.16&r2=1.17&f=u