rpms/googsystray/F-12 googsystray-nogxlib.patch, NONE, 1.1 googsystray.spec, NONE, 1.1 .cvsignore, 1.1, 1.2

[Leon Keijser]

Author: leon

Update of /cvs/pkgs/rpms/googsystray/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20267

Modified Files:
	.cvsignore 
Added Files:
	googsystray-nogxlib.patch googsystray.spec 
Log Message:
Initial commit.


googsystray-nogxlib.patch:
 googsystray/GMain.py |    2 +-
 setup.py             |    8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE googsystray-nogxlib.patch ---
diff -rupN googsystray-1.1.4/googsystray/GMain.py googsystray-1.1.4patched/googsystray/GMain.py
--- googsystray-1.1.4/googsystray/GMain.py	2010-01-05 08:53:39.000000000 +0100
+++ googsystray-1.1.4patched/googsystray/GMain.py	2010-03-19 09:59:40.818353810 +0100
@@ -159,7 +159,7 @@ if os.name == "nt":
 				
 	
 else:
-	from gXlib import X, display, XK, protocol
+	from Xlib import X, display, XK, protocol
 
 #SERVICE_ADD
 import GIcon, GConf, GV, GReader, GMail, GCal, GContacts, GIPC, GWave
diff -rupN googsystray-1.1.4/setup.py googsystray-1.1.4patched/setup.py
--- googsystray-1.1.4/setup.py	2010-01-05 08:53:39.000000000 +0100
+++ googsystray-1.1.4patched/setup.py	2010-03-19 10:01:05.042367291 +0100
@@ -131,13 +131,7 @@ setup(  cmdclass={'i18n': build_i18n},
 	author_email = "jim.duchek at gmail.com",
 	url = "http://www.sourceforge.net/projects/googsystray/",
 	data_files = files,
-	packages = ['googsystray',
-		    'googsystray/gXlib',
-		    'googsystray/gXlib/protocol',
-		    'googsystray/gXlib/support',
-		    'googsystray/gXlib/keysymdef',
-		    'googsystray/gXlib/xobject',
-		    ],
+	packages = ['googsystray'],
 	package_data = { "googsystray" : ["sounds/*","icons/*"] },
 	scripts = ["bin/googsystray"],
         long_description = """Really long text here.""", 


--- NEW FILE googsystray.spec ---
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif

Name:           googsystray
Version:        1.1.4
Release:        2%{?dist}
Summary:        A system tray application for accessing various (online) Google apps

Group:          Applications/Internet
License:        GPLv3
URL:            http://googsystray.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python >= 2.6, pygtk2 >= 2.14, hicolor-icon-theme, python-xlib
# remove included python-xlib (called gXlib here)
Patch0:         googsystray-nogxlib.patch

%description
Googsystray is a system tray app for Google Voice, GMail, Google Calendar, 
Google Reader, and Google Wave. The idea is to be able to keep track of all 
that stuff without having to keep a bunch of browser tabs open, or constantly 
checking them. It notifies on new messages, alerts, etc., and provides basic 
services quickly (Reading or sending a new SMS message, or marking an email 
read, for example.)

%prep
%setup -q
%patch0 -p1 -b .nogxlib
%{__rm} -rf googsystray/gXlib

%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --root %{buildroot}
%find_lang googsystray


%clean
%{__rm} -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG CREDITS LICENSES TODO
%{_bindir}/googsystray
%{python_sitelib}/%{name}-%{version}-*.egg-info
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*
%{_datadir}/applications/googsystray-settings.desktop
%{_datadir}/applications/googsystray.desktop
%{_datadir}/icons/googsystray.png
%{_datadir}/icons/hicolor/16x16/apps/googsystray.png
%{_datadir}/icons/hicolor/32x32/apps/googsystray.png
%{_datadir}/icons/hicolor/48x48/apps/googsystray.png
%{_datadir}/icons/hicolor/64x64/apps/googsystray.png


%changelog
* Mon Mar 22 2010 L.S. Keijser <keijser at stone-it.com> - 1.1.4-2
- remove gXlib dir in prep section
- define python sitelib/sitearch macro conditionally, following
  new python packaging guidelines.

* Fri Mar 19 2010 L.S. Keijser <keijser at stone-it.com> - 1.1.4-1
- new version from upstream

* Sun Dec 27 2009 L.S. Keijser <keijser at stone-it.com> - 1.0.2-1
- new version from upstream
- added patch by Mario Ceresa <mrceresa at gmail.com> to remove
  shipped python-xlib in favor of distribution's copy.
- removed patching desktop and changelog files

* Wed Dec 09 2009 L.S. Keijser <keijser at stone-it.com> - 1.0.0-2
- added unowned directory python_sitelib/googsystray
- added requirement hicolor-icon-theme
- changed to require specific versions of python and pygtk2

* Thu Dec 03 2009 L.S. Keijser <keijser at stone-it.com> - 1.0.0-1
- initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/googsystray/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	24 Mar 2010 03:36:46 -0000	1.1
+++ .cvsignore	24 Mar 2010 16:05:36 -0000	1.2
@@ -0,0 +1 @@
+googsystray-1.1.4.tar.gz