[gnome-gmail/el6/master] Upstream 1.7

Guillaume Kulakowski llaumgui at fedoraproject.org
Sun Oct 24 10:02:51 UTC 2010


commit afc52bd3b975d2462c553864f3fc8f85505bc7d8
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sun Oct 24 12:02:41 2010 +0200

    Upstream 1.7

 .gitignore       |    1 +
 gnome-gmail.spec |   63 ++++++++++++++++++++++++++++++++++++------------------
 sources          |    2 +-
 3 files changed, 44 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86b6705..9c053d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-gmail-1.5.1.tgz
+/gnome-gmail-1.7.tar.gz
diff --git a/gnome-gmail.spec b/gnome-gmail.spec
index 736ecee..46cea7c 100644
--- a/gnome-gmail.spec
+++ b/gnome-gmail.spec
@@ -1,17 +1,22 @@
 Name:           gnome-gmail
-Version:        1.5.1
+Version:        1.7
 Release:        1%{?dist}
-Summary:        Make Gmail an option for the default Gnome mail handler
+Summary:        Integrate GMail into the GNOME desktop
+Summary(fr):    Intègre GMail dans l'environnement de bureau GNOME
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://gnome-gmail.sourceforge.net
-Source0:        http://downloads.sourceforge.net/project/%{name}/Version%20%{version}/%{name}-%{version}.tgz
+Source0:        http://downloads.sourceforge.net/project/gnome-gmail/Version_%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  intltool
+
 Requires:       control-center
-Requires:       dbus-python 
+Requires:       dbus-python
 Requires:       gconf-editor
 Requires:       gnome-python2-gconf
 Requires:       gnome-python2-gnomekeyring
@@ -27,30 +32,35 @@ Requires(postun): GConf2
 %description
 This package makes Gmail a choice in the Gnome control panel for the default
 mail handler. It opens in the default web browser.
+%description -l fr
+Ce paquet rajoute Gmail comme choix possible de logiciel de messagerie par
+défaut de Gnome dans le contrôle des applications préférées. Gmail sera ensuite
+ouvert dans le navigateur web préféré.
 
 
 %prep
 %setup -q
 
-# Rename icons from gmail.png to gnome-gmail.png
-%{__sed} -i -e "s|gmail.png|%{name}.png|g" Makefile
-%{__sed} -i -e "s|<icon-name>gmail</icon-name>|<icon-name>%{name}</icon-name>|g" %{name}.xml
-
-# Move .glade in share
-%{__sed} -i -e "s|/usr/lib/gnome-gmail/gnomegmail.glade|%{_datadir}/%{name}/gnomegmail.glade|g" %{name}
-
-# rpmlint (E): script-without-shebang
-for file in %{name}.schemas %{name}.xml gnomegmail.glade;
-    do %{__sed} -i -e "s|install $file|install --mode=0644 $file|g" Makefile
-done
+# Add a shortcut in menu for an URL is useless !
+# Hide shortcut in the .desktop file
+echo "Hidden=true" >> gnome-gmail.desktop.in
 
 
 %build
+%configure --with-gconf-schema-file-dir=%{_sysconfdir}/gconf/schemas/
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} prefix=%{buildroot} libdir=%{buildroot}/%{_datadir}/%{name} install
+%{__make} DESTDIR=%{buildroot} install
+%find_lang %{name}
+desktop-file-install \
+    --dir=%{buildroot}%{_datadir}/applications \
+    --add-category Network \
+    --add-category Office \
+    --remove-category System \
+    --add-mime-type message/rfc822 \
+    %{name}.desktop
 
 
 %clean
@@ -60,30 +70,41 @@ done
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
-
+update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+    %{_bindir}/gtk-update-icon-cache --q %{_datadir}/icons/hicolor || :
 fi
 
 
 %postun
+update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+    %{_bindir}/gtk-update-icon-cache --q %{_datadir}/icons/hicolor || :
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc ABOUT-NLS COPYING NEWS README
 %{_bindir}/%{name}
+%{_bindir}/setOOmailer
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome-control-center/default-apps/%{name}.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/%{name}/gnomegmail.glade
+%{_datadir}/%{name}/evolution
+%{_datadir}/gnome/autostart/setOOmailer.desktop
+%{_mandir}/man1/%{name}*
+%{_mandir}/man1/setOOmailer*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Fri Oct 22 2010 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
+- Upstream 1.7
+- Add french translation in SPEC
+
 * Wed Jul 21 2010 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.5.1-1
 - Initial packaging
diff --git a/sources b/sources
index b626985..a990e84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d4825ceba9419a99d53dc47d25887c7  gnome-gmail-1.5.1.tgz
+b1aa6d2313c927fe2e762275f2c1a136  gnome-gmail-1.7.tar.gz


More information about the scm-commits mailing list