From bd93c02e7f0f3e3dc21050561daeab6c9a52b1d5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 5 Jul 2010 01:48:51 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for xnoise-plugins-core --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 4b56fb1b382774853b0cb3355a11f983251cd51d Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 8 Jul 2010 11:29:09 +0000 Subject: [PATCH 2/3] Build xnoise-plugins-core for F-13 --- .cvsignore | 1 + sources | 1 + xnoise-plugins-core-0.1.6-no_bold.patch | 11 +++ xnoise-plugins-core.spec | 96 +++++++++++++++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 xnoise-plugins-core-0.1.6-no_bold.patch create mode 100644 xnoise-plugins-core.spec diff --git a/.cvsignore b/.cvsignore index e69de29..06e84f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xnoise-plugins-core-0.1.6.tar.gz diff --git a/sources b/sources index e69de29..0da9f38 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ae9c069696b77470459e5782cb90d4b5 xnoise-plugins-core-0.1.6.tar.gz diff --git a/xnoise-plugins-core-0.1.6-no_bold.patch b/xnoise-plugins-core-0.1.6-no_bold.patch new file mode 100644 index 0000000..4b83aa5 --- /dev/null +++ b/xnoise-plugins-core-0.1.6-no_bold.patch @@ -0,0 +1,11 @@ +--- xnoise-plugins-core-0.1.6/src/notifications/xnoise-notifications.c.no_bold 2010-06-10 17:56:47.000000000 +0200 ++++ xnoise-plugins-core-0.1.6/src/notifications/xnoise-notifications.c 2010-07-03 15:24:52.114278710 +0200 +@@ -376,7 +376,7 @@ + _xnoise_track_data_unref0 (td); + } + xnoise_get_image_path_for_media_uri (uri, &image_path); +- summary = (_tmp18_ = g_strconcat (_tmp17_ = g_strconcat ("", title, NULL), "", NULL), _g_free0 (_tmp17_), _tmp18_); ++ summary = (_tmp18_ = g_strdup (title), _g_free0 (summary), _tmp18_); + body = (_tmp25_ = g_strconcat (_tmp24_ = g_strconcat (_tmp23_ = g_strconcat (_tmp22_ = g_strconcat (_tmp21_ = g_strconcat (_tmp20_ = g_strconcat (_tmp19_ = g_strconcat (_ ("by"), " ", NULL), artist, NULL), " \n", NULL), _ ("on"), NULL), " ", NULL), album, NULL), "", NULL), _g_free0 (_tmp24_), _g_free0 (_tmp23_), _g_free0 (_tmp22_), _g_free0 (_tmp21_), _g_free0 (_tmp20_), _g_free0 (_tmp19_), _tmp25_); + if (self->priv->notification == NULL) { + NotifyNotification* _tmp26_; diff --git a/xnoise-plugins-core.spec b/xnoise-plugins-core.spec new file mode 100644 index 0000000..f49cf87 --- /dev/null +++ b/xnoise-plugins-core.spec @@ -0,0 +1,96 @@ +Name: xnoise-plugins-core +Version: 0.1.6 +Release: 2%{?dist} +Summary: Core plugins for xnoise + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.xnoise-media-player.com/ +Source0: http://xnoise.googlecode.com/files/%{name}-%{version}.tar.gz +# http://code.google.com/p/xnoise/issues/detail?id=46 +Patch0: %{name}-0.1.6-no_bold.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xnoise-devel = %{version} +BuildRequires: gstreamer-plugins-base-devel +BuildRequires: intltool +BuildRequires: libnotify-devel +BuildRequires: libsoup-devel +BuildRequires: libxml2-devel +BuildRequires: sqlite-devel +BuildRequires: taglib-devel +BuildRequires: unique-devel + +%description +This package contains the core plugins for xnoise. Their usage with +xnoise is optional. + +%if 0%{?_with_devel:1} +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains the pkg-config configuration file +for developing additional xnoise plugins. +%endif + + +%prep +%setup -q +%patch0 -p1 -b .no_bold + + +%build +# these plugins are currently unstable +%configure \ + --disable-mediawatcher \ + --disable-lastfm-covers +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# remove invalid locale file +rm -rf $RPM_BUILD_ROOT%{_share}/locale/default +%if 0%{!?_with_devel:1} +# Remove unneeded pkgconfig file +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-1.0.pc +%endif +%find_lang %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING AUTHORS +# TODO +# switch ownership of directory itself to the core xnoise package and +# enable the line below +#{_libdir}/xnoise/* +%{_libdir}/xnoise +# the license files included here are not used (yet) +%exclude %{_datadir}/xnoise-plugins-core + +%if 0%{?_with_devel:1} +%files devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/%{name}-1.0.pc +%endif + + + +%changelog +* Sat Jul 3 2010 Michel Salim - 0.1.6-2 +- Add missing BR on intltool +- notification plugin: remove ... formatting +- disable mediawatcher and lastfm-covers plugins for now + +* Thu Jun 24 2010 Michel Salim - 0.1.6-1 +- Initial package From 838bb41bf784f89608425579f0377b4fb993cfb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:02:47 +0000 Subject: [PATCH 3/3] 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 d05d35d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xnoise-plugins-core -# $Id$ -NAME := xnoise-plugins-core -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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13