rpms/esperanza/devel Makefile, 1.3, 1.4 esperanza-0.4.0-DSO.patch, 1.2, 1.3 esperanza.desktop, 1.2, 1.3 esperanza.png, 1.2, 1.3 esperanza.spec, 1.7, 1.8 sources, 1.3, 1.4 .cvsignore, 1.2, 1.3 dead.package, 1.1, NONE

Orcan Ogetbil oget at fedoraproject.org
Sat Jul 3 03:32:49 UTC 2010


Author: oget

Update of /cvs/pkgs/rpms/esperanza/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10829

Modified Files:
	.cvsignore 
Added Files:
	Makefile esperanza-0.4.0-DSO.patch esperanza.desktop 
	esperanza.png esperanza.spec sources 
Removed Files:
	dead.package 
Log Message:
Resurrecting the package:

* Fri Jul 02 2010 Orcan Ogetbil <oget[at]fedora[at]gmail[dot]com> - 0.4.0-7.20100601git
- update to latest git since this is the only version that works with current xmms2



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	3 Jul 2010 03:32:48 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: esperanza
+# $Id$
+NAME := esperanza
+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)

esperanza-0.4.0-DSO.patch:
 ui.pro |    3 +++
 1 file changed, 3 insertions(+)

Index: esperanza-0.4.0-DSO.patch
===================================================================
RCS file: esperanza-0.4.0-DSO.patch
diff -N esperanza-0.4.0-DSO.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ esperanza-0.4.0-DSO.patch	3 Jul 2010 03:32:49 -0000	1.3
@@ -0,0 +1,13 @@
+diff -up esperanza-0.4.0/src/ui/ui.pro.DSO esperanza-0.4.0/src/ui/ui.pro
+--- esperanza-0.4.0/src/ui/ui.pro.DSO	2010-02-10 12:04:26.926640465 -0500
++++ esperanza-0.4.0/src/ui/ui.pro	2010-02-10 12:04:54.347801277 -0500
+@@ -24,6 +24,9 @@ win32 {
+ 
+ LIBS += $$COMPONENTS
+ 
++# Needed to link properly
++LIBS += -lboost_signals-mt -lX11
++
+ PRE_TARGETDEPS = $$COMPONENTS
+ 
+ # Target


Index: esperanza.desktop
===================================================================
RCS file: esperanza.desktop
diff -N esperanza.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ esperanza.desktop	3 Jul 2010 03:32:49 -0000	1.3
@@ -0,0 +1,13 @@
+
+[Desktop Entry]
+Version=1.0
+Name=Esperanza
+GenericName=Audio Player
+Comment=Play and organize your audio collection
+Exec=xmms2-client-launcher.sh esperanza
+Icon=esperanza
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Audio;Music;Player;AudioVideo;
+X-Desktop-File-Install-Version=0.15


Index: esperanza.spec
===================================================================
RCS file: esperanza.spec
diff -N esperanza.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ esperanza.spec	3 Jul 2010 03:32:49 -0000	1.8
@@ -0,0 +1,84 @@
+%global gitver .20100601git
+
+Name:		esperanza
+Summary: 	A graphical audio player
+Version:	0.4.0
+Release:	7%{gitver}%{?dist}
+License:	GPLv2+
+Group:		Applications/Multimedia
+# The only version that works with the current xmms2 is the git snapshot:
+# git clone git://git.xmms.se/xmms2/esperanza.git
+# rm -fr esperanza/.git*
+# tar jvcf esperanza-0.4.0.20100601git.tar.bz2 esperanza/
+Source0:	%{name}-%{version}%{gitver}.tar.bz2
+Source1:	%{name}.desktop
+# Derived from the included image in data/images
+Source2:	%{name}.png
+Patch0:		esperanza-0.4.0-DSO.patch
+URL:		http://wiki.xmms2.xmms.se/wiki/Client:Esperanza
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	xmms2-devel >= 0.7, qt-devel
+BuildRequires:	desktop-file-utils
+
+%description
+Esperanza is an audio player for the XMMS2 framework written with C++ and QT4. 
+It has a sleek, uncomplicated UI, and supports album art in the playlist.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1 -b .DSO
+# Don't need exec perms here
+chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel*
+
+%build
+./configure --prefix=%{_prefix}
+# Rebuild translation files
+pushd data/translations
+rm -rf *.qm
+for i in *.ts; do
+	lrelease-qt4 $i
+done
+popd
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} install
+
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
+
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING COPYING.GPL data/text/*.html
+%{_bindir}/%{name}*
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/*.desktop
+
+%changelog
+* Fri Jul 02 2010 Orcan Ogetbil <oget[at]fedora[at]gmail[dot]com> - 0.4.0-7.20100601git
+- update to latest git since this is the only version that works with current xmms2
+
+* Wed Feb 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-6
+- fix undefined DSO
+
+* Tue Jan 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-5
+- rebuild for new boost
+
+* Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-4
+- sync up with latest git to support new xmms 0.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-2
+- rebuild translations from source
+
+* Thu Dec  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-1
+- Initial package for Fedora


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	3 Jul 2010 03:32:49 -0000	1.4
@@ -0,0 +1 @@
+c127fb51756cda0cd1c38b5b232d924b  esperanza-0.4.0.20100601git.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/esperanza/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	5 Mar 2009 18:51:21 -0000	1.2
+++ .cvsignore	3 Jul 2010 03:32:48 -0000	1.3
@@ -1 +1 @@
-esperanza-0.4.0.tar.gz
+esperanza-0.4.0.20100601git.tar.bz2


--- dead.package DELETED ---



More information about the scm-commits mailing list