rpms/xmms-flac/F-12 flac-1.2.1-gcc43.patch, NONE, 1.1 xmms-flac.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmms-flac.spec, 1.11, 1.12

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/xmms-flac/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293/F-12

Modified Files:
	.cvsignore sources xmms-flac.spec 
Added Files:
	flac-1.2.1-gcc43.patch xmms-flac.desktop 
Log Message:
Backport latest devel changes (update + appear in contextual menus).


flac-1.2.1-gcc43.patch:
 main.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE flac-1.2.1-gcc43.patch ---
diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
@@ -29,6 +29,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"


--- NEW FILE xmms-flac.desktop ---
[Desktop Entry]
Name=XMMS
Exec=xmms -p -e %F
Icon=xmms
MimeType=audio/x-flac;audio/flac;
Categories=AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Feb 2007 15:55:13 -0000	1.3
+++ .cvsignore	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-flac-1.1.4.tar.gz
+flac-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Feb 2007 15:55:13 -0000	1.3
+++ sources	11 Dec 2009 11:46:33 -0000	1.4
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/F-12/xmms-flac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xmms-flac.spec	27 Jul 2009 08:16:34 -0000	1.11
+++ xmms-flac.spec	11 Dec 2009 11:46:34 -0000	1.12
@@ -2,18 +2,23 @@
 
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
-Version: 1.1.4
-Release: 6%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 # The entire FLAC sources are covered by multiple licenses, but the xmms plugin
 # is only GPLv2+
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
-Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source0: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source1: xmms-flac.desktop
 Patch0: xmms-flac-1.1.4-rpath.patch
+Patch1: flac-1.2.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
 BuildRequires: flac-devel
+BuildRequires: desktop-file-utils
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -24,6 +29,7 @@ This is the input plugin for XMMS to be 
 %prep
 %setup -q -n flac-%{version}
 %patch0 -p1 -b .rpath
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -35,19 +41,34 @@ This is the input plugin for XMMS to be 
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
     %{buildroot}%{xmms_inputdir}/libxmms-flac.so
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.GPL
+%{_datadir}/applications/xmms-flac.desktop
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.4-7
+- Include hidden desktop entry for the mimetype (#508203).
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild