rpms/mumbles/devel import.log, NONE, 1.1 mumbles-sitedir.patch, NONE, 1.1 mumbles.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[John Anderson]

Author: janderson

Update of /cvs/pkgs/rpms/mumbles/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11082/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mumbles-sitedir.patch mumbles.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
mumbles-0_4-7_fc10:HEAD:mumbles-0.4-7.fc10.src.rpm:1231102993

mumbles-sitedir.patch:

--- NEW FILE mumbles-sitedir.patch ---
diff -uNr mumbles-0.4-orig/bin/mumbles mumbles-0.4/bin/mumbles
--- mumbles-0.4-orig/bin/mumbles	2007-08-26 17:30:20.000000000 -0500
+++ mumbles-0.4/bin/mumbles	2008-11-18 09:01:36.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # THIS FILE IS PART OF THE MUMBLES PROJECT AND IS LICENSED UNDER THE GPL.
 # SEE THE 'COPYING' FILE FOR DETAILS
@@ -8,7 +8,9 @@
 #------------------------------------------------------------------------
 import os, sys
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/bin/mumbles-send mumbles-0.4/bin/mumbles-send
--- mumbles-0.4-orig/bin/mumbles-send	2007-08-28 22:17:51.000000000 -0500
+++ mumbles-0.4/bin/mumbles-send	2008-11-18 09:01:45.000000000 -0600
@@ -22,7 +22,10 @@
 from socket import AF_INET, SOCK_DGRAM, socket
 from getpass import getpass
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
+print "syspath: %s" % (syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/setup.py mumbles-0.4/setup.py
--- mumbles-0.4-orig/setup.py	2007-08-29 20:42:56.000000000 -0500
+++ mumbles-0.4/setup.py	2008-11-16 10:07:07.000000000 -0600
@@ -17,7 +17,8 @@
 	license='GNU GPL',
 	platforms='linux',
 	scripts=['bin/mumbles', 'bin/mumbles-send'],
-	packages=['src'],
+	package_dir={'mumbles': 'src'},
+	packages=['mumbles'],
 	data_files=[
 		('share/icons/hicolor/22x22/apps', ['src/ui/mumbles.png']),
 		('share/icons/hicolor/scalable/apps', ['src/ui/mumbles.svg']),


--- NEW FILE mumbles.spec ---
%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mumbles
Version:	0.4
Release:	7%{?dist}
Summary:	A plugin driven DBus based notification system for the Gnome desktop

Group:		User Interface/Desktops
License:	GPLv2
URL:		http://www.mumbles-project.org
Source0:	http://downloads.sourceforge.net/mumbles/mumbles_%{version}-1.tar.gz
#		The default setup.py uses src as the python package name and doesn't
#		have the correct search path. Submitted upstream id #2307852
Patch0:		mumbles-sitedir.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python
BuildRequires:	python-setuptools-devel
BuildRequires:	desktop-file-utils

BuildArch:	noarch

Requires:	pygtk2 dbus dbus-python pycairo pygtk2-libglade

%description
Mumbles is a plugin driven, DBus based notification system written for the
Gnome desktop. Similar to libnotify notifications and Growl for OSX, mumbles
aims to provide a modern notification system for the GNU/Linux Desktop.

%prep
%setup -q -n mumbles-%{version}
%patch0 -p1 -b .sitedir

# small fix to avoid warning from desktop-file-install
sed -i 's!mumbles.png!mumbles!' bin/mumbles.desktop

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install	\
	--dir %{buildroot}%{_datadir}/applications	\
	--copy-name-to-generic-name			\
	--delete-original				\
	--remove-category=Application			\
	%{buildroot}%{_datadir}/applications/%{name}.desktop

desktop-file-install \
	--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
	--copy-name-to-generic-name   \
	--remove-category=Application   \
	--add-category="GNOME;GTK;TrayIcon;"  \
	--add-only-show-in="GNOME;XFCE;"  \
	%{buildroot}%{_datadir}/applications/%{name}.desktop

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
fi


%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
fi

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README
%{_bindir}/%{name}
%{_bindir}/mumbles-send
%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-7
- Added desktop-file-install back

* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-6
- Fixes from review comments #12-15
- Corrected source0 timestamp
- Changed group to User Interface/Desktops
- Removed unneeded update-desktop-database
- desktop-file-install cleanup

* Tue Dec 23 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-5
- Added python version to files section for python 2.6 compatibility
- Added fix for desktop file per comment #10

* Sun Dec 21 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-4
- Modified patch line per review comment #8

* Thu Nov 20 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-3
- Fixed buildroot macro per comment #5

* Wed Nov 19 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-2
- Changes from review comments #1 and #2
- macro cleanup
- fixed BuildRequires

* Fri Nov 14 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:19:30 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:03:55 -0000	1.2
@@ -0,0 +1 @@
+mumbles_0.4-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:19:30 -0000	1.1
+++ sources	4 Jan 2009 21:03:56 -0000	1.2
@@ -0,0 +1 @@
+a6b24223dc23e5022332586ffc454e84  mumbles_0.4-1.tar.gz