rpms/googsystray/F-13 googsystray-nogxlib.patch, 1.1, 1.2 googsystray.spec, 1.1, 1.2 sources, 1.4, 1.5
Leon Keijser
leon at fedoraproject.org
Tue Jun 22 09:22:41 UTC 2010
Author: leon
Update of /cvs/pkgs/rpms/googsystray/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19677
Modified Files:
googsystray-nogxlib.patch googsystray.spec sources
Log Message:
Update to 1.2.0
googsystray-nogxlib.patch:
googsystray/GMain.py | 2 +-
setup.py | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
Index: googsystray-nogxlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/googsystray/F-13/googsystray-nogxlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- googsystray-nogxlib.patch 24 Mar 2010 16:06:28 -0000 1.1
+++ googsystray-nogxlib.patch 22 Jun 2010 09:22:40 -0000 1.2
@@ -1,19 +1,19 @@
-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":
+diff -rupN googsystray-1.2.0/googsystray/GMain.py googsystray-1.2.0-patched/googsystray/GMain.py
+--- googsystray-1.2.0/googsystray/GMain.py 2010-06-21 16:35:03.000000000 +0200
++++ googsystray-1.2.0-patched/googsystray/GMain.py 2010-06-22 10:24:14.368993872 +0200
+@@ -156,7 +156,7 @@ if os.name == "nt":
else:
-- from gXlib import X, display, XK, protocol
-+ from Xlib import X, display, XK, protocol
+- from gXlib import X, display, XK
++ from Xlib import X, display, XK
#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},
+ import GIcon
+diff -rupN googsystray-1.2.0/setup.py googsystray-1.2.0-patched/setup.py
+--- googsystray-1.2.0/setup.py 2010-06-21 16:35:03.000000000 +0200
++++ googsystray-1.2.0-patched/setup.py 2010-06-22 10:24:58.512003580 +0200
+@@ -164,13 +164,7 @@ setup( cmdclass={'i18n': build_i18n},
author_email = "jim.duchek at gmail.com",
url = "http://www.sourceforge.net/projects/googsystray/",
data_files = files,
Index: googsystray.spec
===================================================================
RCS file: /cvs/pkgs/rpms/googsystray/F-13/googsystray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- googsystray.spec 24 Mar 2010 16:06:29 -0000 1.1
+++ googsystray.spec 22 Jun 2010 09:22:40 -0000 1.2
@@ -4,8 +4,8 @@
%endif
Name: googsystray
-Version: 1.1.4
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
Summary: A system tray application for accessing various (online) Google apps
Group: Applications/Internet
@@ -15,6 +15,7 @@ Source0: http://downloads.sourcef
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
+BuildRequires: gettext, intltool, desktop-file-utils
Requires: python >= 2.6, pygtk2 >= 2.14, hicolor-icon-theme, python-xlib
# remove included python-xlib (called gXlib here)
Patch0: googsystray-nogxlib.patch
@@ -28,22 +29,30 @@ services quickly (Reading or sending a n
read, for example.)
%prep
-%setup -q
+%setup -q
%patch0 -p1 -b .nogxlib
-%{__rm} -rf googsystray/gXlib
+rm -rf googsystray/gXlib
+# remove unnecessary shebang
+sed -i 1d googsystray/htmltextview.py
%build
-%{__python} setup.py build
+# build locales first
+python setup.py i18n --force
+python setup.py build
%install
-%{__rm} -rf %{buildroot}
-%{__python} setup.py install --root %{buildroot}
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%find_lang googsystray
-
+desktop-file-install \
+ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+ pkg/freedesktop/%{name}.desktop
+mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
+install -m 644 pkg/freedesktop/64x64/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/googsystray.png
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/icons/%{name}.png
%clean
-%{__rm} -rf %{buildroot}
-
+rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -54,14 +63,20 @@ read, for example.)
%{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
+%{_datadir}/pixmaps/googsystray.png
+%{_datadir}/icons/hicolor/*/apps/googsystray.png
%changelog
+* Tue Jun 22 2010 L.S. Keijser <keijser at stone-it.com> - 1.2.0-1
+- new version from upstream
+
+* Mon Apr 12 2010 L.S. Keijser <keijser at stone-it.com> - 1.1.4-3
+- removed unnecessary macros
+- use wildcard in path to icons
+- properly install desktop file
+- build locales instead of copying pre-built files
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/googsystray/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 24 Mar 2010 20:37:52 -0000 1.4
+++ sources 22 Jun 2010 09:22:40 -0000 1.5
@@ -1 +1 @@
-2c079c139cdd2e5cbe733816bf27e8ae googsystray-1.1.4.tar.gz
+9f439af7d41020a1f084d5e797927a46 googsystray-1.2.0.tar.gz
More information about the scm-commits
mailing list