rpms/entertainer/F-12 entertainer-manager.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 entertainer.spec, 1.3, 1.4 import.log, 1.1, 1.2 sources, 1.2, 1.3 entertainer-content-manager.desktop, 1.1, NONE entertainer-preferences.desktop, 1.1, NONE

[julian]

Author: julian

Update of /cvs/pkgs/rpms/entertainer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23798/F-12

Modified Files:
	.cvsignore entertainer.spec import.log sources 
Added Files:
	entertainer-manager.desktop 
Removed Files:
	entertainer-content-manager.desktop 
	entertainer-preferences.desktop 
Log Message:
Updated to bzr snapshot for pyclutter compability



--- NEW FILE entertainer-manager.desktop ---
[Desktop Entry]
Name=Entertainer-Manager
GenericName=Entertainer settings manager
Comment=Set the preferences for the entertainer media center
Exec=entertainer-manager
Icon=entertainer
Terminal=false
Type=Application
Categories=Settings;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2009 10:30:48 -0000	1.2
+++ .cvsignore	25 Nov 2009 13:40:12 -0000	1.3
@@ -1 +1 @@
-entertainer-0.4.2.tar.gz
+entertainer-snapshot.tar.gz


Index: entertainer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/F-12/entertainer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- entertainer.spec	28 Sep 2009 14:09:46 -0000	1.3
+++ entertainer.spec	25 Nov 2009 13:40:12 -0000	1.4
@@ -1,17 +1,22 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+#For now I have to use the builds from their "future" branch with applied patches from the "future-fixes" branch
+
 Name:		entertainer
 Version:	0.4.2
-Release:	7%{?dist}
+Release:	8.20091120bzr%{?dist}
 Summary:	A simple mediacenter based on clutter
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		https://launchpad.net/entertainer
-Source0:	http://launchpad.net/entertainer/entertainer-0.4/entertainer-0.4.2/+download/entertainer-0.4.2.tar.gz
+
+#source is coming from the following branches:
+#https://code.launchpad.net/~entertainer-releases/entertainer/entertainer-future
+#https://code.launchpad.net/~francesco-marella/entertainer/future-fixes
+Source0:	entertainer-snapshot.tar.gz
 
 #Adding desktop files for the managing apps, will push them upstream
-Patch0:		http://julian.fedorapeople.org/entertainer/entertainer-preferences.desktop
-Patch1:		http://julian.fedorapeople.org/entertainer/entertainer-content-manager.desktop
+Patch0:		http://julian.fedorapeople.org/entertainer/entertainer-manager.desktop
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -61,16 +66,10 @@ This package contains documentation file
 
 
 %prep
-%setup -q
+%setup -n future
 #Dropping gtk-update-icon-cache for mocks sake
 sed -i /gtk-update-icon-cache/d setup.py
 
-#There are some unnecessary prebangs. I'm trying to get rid of them upstream
-#https://bugs.launchpad.net/entertainer/+bug/404372
-cd entertainerlib
-sed -i '1{/^#!/d}' backend/backend_server.py utils/preferences_dialog.py
-sed -i '1{/^#/d}' utils/content_management_dialog.py frontend/translation_setup.py
-
 
 %build
 %{__python} setup.py build
@@ -85,10 +84,7 @@ rm -rf %{buildroot}
 desktop-file-validate %{buildroot}/%{_datadir}/applications/entertainer.desktop
 
 #Install preferences manager desktop file
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{PATCH0}
-
-#Install content manager desktop file
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{PATCH1}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{PATCH0}
 
 
 #Installing the documentation
@@ -104,7 +100,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/entertainer*
 %{python_sitelib}/entertainerlib/
-%{python_sitelib}/Entertainer-*.egg-info
+%{python_sitelib}/entertainer-*.egg-info
 %{_datadir}/applications/entertainer*.desktop
 %{_datadir}/entertainer/
 #We have .png and .svg files:
@@ -135,6 +131,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 #Icon Cache updated
 
 %changelog
+* Fri Nov 20 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-8.20091120bzr
+- updated to the latest development version to play together with pyclutter 0.9 (API changes)
+- consistent macros
+- https://bugs.launchpad.net/entertainer/+bug/404372 is fixed now, dropping workaround
+- dropped obsolete requires
+- content and preferences manager merged into one app
+
+
 * Mon Sep 28 2009 Julian Aloofi <julian at, fedoraproject.org> 0.4.2-7
 - Added explicit Requires for the pyclutter subpackages due to problems with the package in Rawhide
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Jul 2009 10:30:48 -0000	1.1
+++ import.log	25 Nov 2009 13:40:12 -0000	1.2
@@ -1 +1,2 @@
 entertainer-0_4_2-5_fc11:HEAD:entertainer-0.4.2-5.fc11.src.rpm:1248776857
+entertainer-0_4_2-8_20091120bzr_fc12:F-12:entertainer-0.4.2-8.20091120bzr.fc12.src.rpm:1259156343


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/entertainer/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2009 10:30:48 -0000	1.2
+++ sources	25 Nov 2009 13:40:12 -0000	1.3
@@ -1 +1 @@
-e59217bdfc0c10462294b5ad5a9b1b89  entertainer-0.4.2.tar.gz
+976eec9cfc6b56cbe544ee639602ca4b  entertainer-snapshot.tar.gz


--- entertainer-content-manager.desktop DELETED ---


--- entertainer-preferences.desktop DELETED ---