From 353cbdea9528c63ef1366bb1e1196888a3b5e1db Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:12:43 +0000 Subject: [PATCH 01/18] Initialize branch F-11 for xmms-flac --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From b57980166ffa63927551981fdc362fef4e10f23e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:16:34 +0000 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index d6eeadf..f27d62d 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.1.4 -Release: 5%{?dist} +Release: 6%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -48,6 +48,9 @@ This is the input plugin for XMMS to be able to read FLAC files. %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d4d05084e56547420a911033ecfbc9bed6cd2d37 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:01 +0000 Subject: [PATCH 03/18] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f86c7c..381c8a9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmms-flac SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 06c3c7d450b93858792e85e741e46a349fd3d0c3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:35:00 +0000 Subject: [PATCH 04/18] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f86c7c..381c8a9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmms-flac SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f99764e85fcfe747fbc1281362a6ca9879c23d4e Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 8 Dec 2009 19:34:25 +0000 Subject: [PATCH 05/18] Update to 1.2.1 and add menu entry. --- .cvsignore | 2 +- flac-1.2.1-gcc43.patch | 11 +++++++++++ sources | 2 +- xmms-flac.desktop | 9 +++++++++ xmms-flac.spec | 27 ++++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 flac-1.2.1-gcc43.patch create mode 100644 xmms-flac.desktop diff --git a/.cvsignore b/.cvsignore index 91199e8..b6075fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flac-1.1.4.tar.gz +flac-1.2.1.tar.gz diff --git a/flac-1.2.1-gcc43.patch b/flac-1.2.1-gcc43.patch new file mode 100644 index 0000000..7fdbf80 --- /dev/null +++ b/flac-1.2.1-gcc43.patch @@ -0,0 +1,11 @@ +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 ++#include + #include + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" diff --git a/sources b/sources index 75d8744..87f1211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3958cbd5b6ed8c14966792538e44223b flac-1.1.4.tar.gz +153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz diff --git a/xmms-flac.desktop b/xmms-flac.desktop new file mode 100644 index 0000000..64b823d --- /dev/null +++ b/xmms-flac.desktop @@ -0,0 +1,9 @@ +[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 diff --git a/xmms-flac.spec b/xmms-flac.spec index f27d62d..4f16cc5 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -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 able to read FLAC files. %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 able to read FLAC files. %{__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 1.2.1-1 +- Update to 1.2.1. + +* Tue Nov 24 2009 Matthias Saou 1.1.4-7 +- Include hidden desktop entry for the mimetype (#508203). + * Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 410b6a0debc680584baa6b9969c6add8f7dd71d1 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 11 Dec 2009 11:46:33 +0000 Subject: [PATCH 06/18] Backport latest devel changes (update + appear in contextual menus). --- .cvsignore | 2 +- flac-1.2.1-gcc43.patch | 11 +++++++++++ sources | 2 +- xmms-flac.desktop | 9 +++++++++ xmms-flac.spec | 30 +++++++++++++++++++++++++++--- 5 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 flac-1.2.1-gcc43.patch create mode 100644 xmms-flac.desktop diff --git a/.cvsignore b/.cvsignore index 91199e8..b6075fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -flac-1.1.4.tar.gz +flac-1.2.1.tar.gz diff --git a/flac-1.2.1-gcc43.patch b/flac-1.2.1-gcc43.patch new file mode 100644 index 0000000..7fdbf80 --- /dev/null +++ b/flac-1.2.1-gcc43.patch @@ -0,0 +1,11 @@ +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 ++#include + #include + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" diff --git a/sources b/sources index 75d8744..87f1211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3958cbd5b6ed8c14966792538e44223b flac-1.1.4.tar.gz +153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz diff --git a/xmms-flac.desktop b/xmms-flac.desktop new file mode 100644 index 0000000..64b823d --- /dev/null +++ b/xmms-flac.desktop @@ -0,0 +1,9 @@ +[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 diff --git a/xmms-flac.spec b/xmms-flac.spec index d6eeadf..4f16cc5 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -2,18 +2,23 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac -Version: 1.1.4 -Release: 5%{?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 able to read FLAC files. %prep %setup -q -n flac-%{version} %patch0 -p1 -b .rpath +%patch1 -p1 -b .gcc43 %build @@ -35,19 +41,37 @@ This is the input plugin for XMMS to be able to read FLAC files. %{__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 1.2.1-1 +- Update to 1.2.1. + +* Tue Nov 24 2009 Matthias Saou 1.1.4-7 +- Include hidden desktop entry for the mimetype (#508203). + +* Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 863e60cf3a04df2c436c55d1d6ef627ae1352684 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:59:43 +0000 Subject: [PATCH 07/18] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 381c8a9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmms-flac -# $Id$ -NAME := xmms-flac -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d4acf2dad9157ef30af76173f5035162f2b6df1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:59:45 +0000 Subject: [PATCH 08/18] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 381c8a9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmms-flac -# $Id$ -NAME := xmms-flac -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From c485d82407117e31d3496ab8a03b96d56d303fd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:42:04 -0600 Subject: [PATCH 09/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 4f16cc5..2cddb7b 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Dec 8 2009 Matthias Saou 1.2.1-1 - Update to 1.2.1. From 9e5dbb21d9a4d0a7fea77e9dc1470a665b4a6b42 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:07:01 -0600 Subject: [PATCH 10/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 2cddb7b..7bd3ed1 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 8d78549e073a10c21dd7c79a60483f1c10112dfd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 01:02:49 -0500 Subject: [PATCH 11/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 7bd3ed1..958a21f 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 66715f2e8aae9982257c73881f4b3dda8e54452f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:53:15 -0600 Subject: [PATCH 12/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 958a21f..c078c24 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 4%{?dist} +Release: 5%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4ab22ed710a73fc186f88abd7657dfb277828cbe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:36:19 -0500 Subject: [PATCH 13/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index c078c24..e86185e 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0150ad220c2d9580594bf87f9884d97c8070a8c8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:12:43 -0500 Subject: [PATCH 14/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index e86185e..255e124 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 6%{?dist} +Release: 7%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1c04d64a20fff9c7b76abca418e9a37e3fc35a4e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:20:04 +0000 Subject: [PATCH 15/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 255e124..1df0da9 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d4808d5a81820b456d0c1b9217e9b736c089847b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:11:51 +0000 Subject: [PATCH 16/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmms-flac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms-flac.spec b/xmms-flac.spec index 1df0da9..a97d5a5 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 8%{?dist} +Release: 9%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -63,6 +63,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From fd95f786fc86325dcf1f812509b57c84a61f68cd Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 22 Jul 2015 15:49:58 -0500 Subject: [PATCH 17/18] Work around non-constant format warnings --- format-fix.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ xmms-flac.spec | 7 ++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 format-fix.patch diff --git a/format-fix.patch b/format-fix.patch new file mode 100644 index 0000000..b4d9d8e --- /dev/null +++ b/format-fix.patch @@ -0,0 +1,43 @@ +--- src/test_grabbag/cuesheet/main.c.orig 2015-07-22 15:32:36.583949513 -0500 ++++ src/test_grabbag/cuesheet/main.c 2015-07-22 15:33:59.300462357 -0500 +@@ -115,12 +115,12 @@ + const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ printf("%s", usage); + return 0; + } + + if(argc < 3 || argc > 4) { +- fprintf(stderr, usage); ++ fprintf(stderr, "%s", usage); + return 255; + } + +@@ -129,7 +129,7 @@ + if(0 == strcmp(argv[3], "cdda")) + is_cdda = true; + else { +- fprintf(stderr, usage); ++ fprintf(stderr, "%s", usage); + return 255; + } + } +--- src/test_grabbag/picture/main.c.orig 2015-07-22 15:45:04.445998934 -0500 ++++ src/test_grabbag/picture/main.c 2015-07-22 15:45:41.830750344 -0500 +@@ -211,12 +211,12 @@ + const char *usage = "usage: test_pictures path_prefix\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ printf("%s", usage); + return 0; + } + + if(argc != 2) { +- fprintf(stderr, usage); ++ fprintf(stderr, "%s", usage); + return 255; + } + diff --git a/xmms-flac.spec b/xmms-flac.spec index a97d5a5..182d6bb 100644 --- a/xmms-flac.spec +++ b/xmms-flac.spec @@ -3,7 +3,7 @@ Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files Name: xmms-flac Version: 1.2.1 -Release: 9%{?dist} +Release: 10%{?dist} # The entire FLAC sources are covered by multiple licenses, but the xmms plugin # is only GPLv2+ License: GPLv2+ @@ -13,6 +13,7 @@ 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 +Patch2: format-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -30,6 +31,7 @@ This is the input plugin for XMMS to be able to read FLAC files. %setup -q -n flac-%{version} %patch0 -p1 -b .rpath %patch1 -p1 -b .gcc43 +%patch2 -p0 -b .format-fix %build @@ -63,6 +65,9 @@ update-desktop-database &> /dev/null || : %changelog +* Wed Jul 22 2015 Bruno Wolff III - 1.2.1-10 +- Work around non-constant format string warning + * Fri Jun 19 2015 Fedora Release Engineering - 1.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3090b890bc58a89adc5e3a595ff71f6af8e8b742 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 10 Aug 2015 11:12:52 -0400 Subject: [PATCH 18/18] now provided as a subpackage of flac --- .gitignore | 1 - dead.package | 1 + flac-1.2.1-gcc43.patch | 11 --- format-fix.patch | 43 ----------- sources | 1 - xmms-flac-1.1.4-rpath.patch | 44 ----------- xmms-flac.desktop | 9 --- xmms-flac.spec | 147 ------------------------------------ 8 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 flac-1.2.1-gcc43.patch delete mode 100644 format-fix.patch delete mode 100644 sources delete mode 100644 xmms-flac-1.1.4-rpath.patch delete mode 100644 xmms-flac.desktop delete mode 100644 xmms-flac.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b6075fe..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flac-1.2.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6572eb6 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +now provided as a subpackage of flac diff --git a/flac-1.2.1-gcc43.patch b/flac-1.2.1-gcc43.patch deleted file mode 100644 index 7fdbf80..0000000 --- a/flac-1.2.1-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 -+#include - #include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" diff --git a/format-fix.patch b/format-fix.patch deleted file mode 100644 index b4d9d8e..0000000 --- a/format-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- src/test_grabbag/cuesheet/main.c.orig 2015-07-22 15:32:36.583949513 -0500 -+++ src/test_grabbag/cuesheet/main.c 2015-07-22 15:33:59.300462357 -0500 -@@ -115,12 +115,12 @@ - const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n"; - - if(argc > 1 && 0 == strcmp(argv[1], "-h")) { -- printf(usage); -+ printf("%s", usage); - return 0; - } - - if(argc < 3 || argc > 4) { -- fprintf(stderr, usage); -+ fprintf(stderr, "%s", usage); - return 255; - } - -@@ -129,7 +129,7 @@ - if(0 == strcmp(argv[3], "cdda")) - is_cdda = true; - else { -- fprintf(stderr, usage); -+ fprintf(stderr, "%s", usage); - return 255; - } - } ---- src/test_grabbag/picture/main.c.orig 2015-07-22 15:45:04.445998934 -0500 -+++ src/test_grabbag/picture/main.c 2015-07-22 15:45:41.830750344 -0500 -@@ -211,12 +211,12 @@ - const char *usage = "usage: test_pictures path_prefix\n"; - - if(argc > 1 && 0 == strcmp(argv[1], "-h")) { -- printf(usage); -+ printf("%s", usage); - return 0; - } - - if(argc != 2) { -- fprintf(stderr, usage); -+ fprintf(stderr, "%s", usage); - return 255; - } - diff --git a/sources b/sources deleted file mode 100644 index 87f1211..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz diff --git a/xmms-flac-1.1.4-rpath.patch b/xmms-flac-1.1.4-rpath.patch deleted file mode 100644 index 82ea757..0000000 --- a/xmms-flac-1.1.4-rpath.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naupr flac-1.1.4.orig/src/plugin_xmms/Makefile.am flac-1.1.4/src/plugin_xmms/Makefile.am ---- flac-1.1.4.orig/src/plugin_xmms/Makefile.am 2007-02-02 07:25:04.000000000 +0100 -+++ flac-1.1.4/src/plugin_xmms/Makefile.am 2007-08-23 12:03:05.000000000 +0200 -@@ -30,7 +30,7 @@ noinst_HEADERS = \ - plugin.h \ - tag.h - --AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -+AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -lFLAC - - INCLUDES = -I$(top_srcdir)/src - if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY -@@ -62,8 +62,7 @@ libxmms_flac_la_LIBADD = \ - $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ - $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ - $(top_builddir)/src/share/utf8/libutf8.la \ -- $(top_builddir)/src/libFLAC/libFLAC.la \ -- -L$(top_builddir)/src/libFLAC/.libs \ -+ -lFLAC \ - @OGG_LIBS@ \ - @XMMS_LIBS@ \ - @LIBICONV@ -diff -Naupr flac-1.1.4.orig/src/plugin_xmms/Makefile.in flac-1.1.4/src/plugin_xmms/Makefile.in ---- flac-1.1.4.orig/src/plugin_xmms/Makefile.in 2007-02-14 07:14:19.000000000 +0100 -+++ flac-1.1.4/src/plugin_xmms/Makefile.in 2007-08-23 12:03:20.000000000 +0200 -@@ -235,7 +235,7 @@ noinst_HEADERS = \ - tag.h - - --AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -+AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -lFLAC - - INCLUDES = -I$(top_srcdir)/src - @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE@xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@ -@@ -261,8 +261,7 @@ libxmms_flac_la_LIBADD = \ - $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ - $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ - $(top_builddir)/src/share/utf8/libutf8.la \ -- $(top_builddir)/src/libFLAC/libFLAC.la \ -- -L$(top_builddir)/src/libFLAC/.libs \ -+ -lFLAC \ - @OGG_LIBS@ \ - @XMMS_LIBS@ \ - @LIBICONV@ diff --git a/xmms-flac.desktop b/xmms-flac.desktop deleted file mode 100644 index 64b823d..0000000 --- a/xmms-flac.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[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 diff --git a/xmms-flac.spec b/xmms-flac.spec deleted file mode 100644 index 182d6bb..0000000 --- a/xmms-flac.spec +++ /dev/null @@ -1,147 +0,0 @@ -%define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General) - -Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files -Name: xmms-flac -Version: 1.2.1 -Release: 10%{?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/ -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 -Patch2: format-fix.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, -seeking, and archival, and gives 25-75% compression on typical CD audio. -This is the input plugin for XMMS to be able to read FLAC files. - - -%prep -%setup -q -n flac-%{version} -%patch0 -p1 -b .rpath -%patch1 -p1 -b .gcc43 -%patch2 -p0 -b .format-fix - - -%build -%configure --with-pic -%{__make} %{?_smp_mflags} - - -%install -%{__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 -* Wed Jul 22 2015 Bruno Wolff III - 1.2.1-10 -- Work around non-constant format string warning - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Dec 8 2009 Matthias Saou 1.2.1-1 -- Update to 1.2.1. - -* Tue Nov 24 2009 Matthias Saou 1.1.4-7 -- Include hidden desktop entry for the mimetype (#508203). - -* Mon Jul 27 2009 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Fedora Release Engineering - 1.1.4-4 -- Autorebuild for GCC 4.3 - -* Thu Aug 23 2007 Matthias Saou 1.1.4-3 -- Include patch to remove rpath usage and link against external libFLAC. - -* Fri Aug 3 2007 Matthias Saou 1.1.4-2 -- Update License field. - -* Thu Feb 15 2007 Matthias Saou 1.1.4-1 -- Update to 1.1.4. -- Remove now included "xmms" patch. -- Remove no longer relevant "libtool" patch. -- No longer autoreconf, since we don't patch configure.in anymore. - -* Mon Aug 28 2006 Matthias Saou 1.1.2-27 -- FC6 rebuild. - -* Mon Feb 13 2006 Matthias Saou 1.1.2-26 -- Rebuild for new glibc/gcc. - -* Tue Nov 22 2005 Matthias Saou 1.1.2-25 -- Update patch with one provided from FLAC CVS by Øyvind Stegard to further - fix configuration dialog crashes (#173723). - -* Sat May 28 2005 Matthias Saou 1.1.2-24 -- Bump release to 24 since main Core flac obsoletes xmms-flac < 1.1.2-24. -- Add patches from FC flac to fix libtool issues on x86_64. - -* Thu May 19 2005 Matthias Saou 1.1.2-2 -- Add patch to fix memory double freeing issue (bz #157796). - -* Thu May 19 2005 Matthias Saou 1.1.2-1 -- Initial RPM release since the plugin was disabled from the main flac in - Core, because xmms was moved to Extras, thus no longer available at build - time for Core packages. -- Laziness has made me include the whole 1.4MB of FLAC sources, but if - someone wants to provide a simple script to extract only the relevant sources - in order to create a custom source package of the plugin only, that would - be great! -