[gnome-do-plugins] Update to latest upstream release

Theodore Lee antiaircraft at fedoraproject.org
Sat Jul 16 04:02:23 UTC 2011


commit 8ac2622e0c1094677ddfd01d22aca4495027b9ec
Author: Theodore Lee <theo148 at gmail.com>
Date:   Sat Jul 16 12:01:58 2011 +0800

    Update to latest upstream release

 .gitignore            |    1 +
 gnome-do-plugins.spec |  100 ++++++++++++++++++++++++++----------------------
 sources               |    2 +-
 3 files changed, 56 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d9b67e..e838f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-do-plugins-0.8.2.1.tar.gz
+/gnome-do-plugins-0.8.4.tar.gz
diff --git a/gnome-do-plugins.spec b/gnome-do-plugins.spec
index b37c903..2ffdce5 100644
--- a/gnome-do-plugins.spec
+++ b/gnome-do-plugins.spec
@@ -1,31 +1,33 @@
-%define         debug_package %{nil}
+%global         debug_package %{nil}
+%global         mainver 0.8.4
 
 Name:           gnome-do-plugins
-Version:        0.8.2.1
+Version:        %{mainver}
 Release:        2%{?dist}
 Summary:        Plugins for GNOME Do
 Group:          Applications/Productivity
 License:        GPLv3+
-URL:            http://do.davebsd.com
-Source0:        http://edge.launchpad.net/do-plugins/0.8/%{version}/+download/%{name}-%{version}.tar.gz
+URL:            http://do.davebsd.com/
+Source0:        http://launchpad.net/do-plugins/trunk/%{mainver}/+download/%{name}-%{version}.tar.gz
 
-# Fixes Thunderbird 3.0 contacts
-Patch0: gnome-do-plugins-thunderbird.patch
+# Fixes Thunderbird >= 3.0 contacts
+Patch0:         gnome-do-plugins-thunderbird.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel ndesk-dbus-glib-devel gnome-do-devel
 BuildRequires:  gnome-sharp-devel gtk-sharp2-devel gnome-desktop-sharp-devel
 BuildRequires:  gnome-keyring-sharp-devel monodevelop mono-addins-devel
-BuildRequires:  gdata-sharp-devel
-BuildRequires:  notify-sharp-devel
+BuildRequires:  notify-sharp-devel gdata-sharp-devel
 BuildRequires:  intltool
-# Needed because the patch touches Makefile.am
-BuildRequires:  automake
+# Needed because a patch touches Makefile.am
+#BuildRequires:  automake
 Requires:       gnome-do >= %{version}
 
 # ppc* not supported: needs monodevelop which is not built for ppc*
-ExcludeArch: ppc ppc64 sparc64
+ExcludeArch:    ppc ppc64 sparc64
+
+Obsoletes:      gnome-do-plugins-evolution < 0.8.4-1%{?dist}
 
 %description
 GNOME Do allows you to quickly search for many objects present in your
@@ -44,7 +46,7 @@ Requires:       banshee
 Requires:       gnome-do-plugins = %{version}
 
 %description banshee
-gnone-do plugins for banshee
+GNOME Do plugin for Banshee
 
 %package bibtex
 Summary:        GNOME Do BibTeX plugin
@@ -52,7 +54,7 @@ Group:          Applications/Productivity
 Requires:       gnome-do-plugins = %{version}
 
 %description bibtex
-gnome-do plugins for bibtex
+GNOME Do plugin for BibTeX
 
 %package clawsmail
 Summary:        GNOME Do Claws Mail plugin
@@ -61,7 +63,7 @@ Requires:       claws-mail
 Requires:       gnome-do-plugins = %{version}
 
 %description clawsmail
-gnome-do plugins for clawsmail
+GNOME Do plugin for Claws Mail
 
 %package epiphany
 Summary:        GNOME Do Epiphany plugin
@@ -70,18 +72,7 @@ Requires:       epiphany
 Requires:       gnome-do-plugins = %{version}
 
 %description epiphany
-gnome-do plugins for epiphany
-
-%package evolution
-Summary:        GNOME Do Evolution plugin
-Group:          Applications/Productivity
-BuildRequires:  evolution-sharp-devel
-Requires:       evolution-sharp
-Requires:       evolution
-Requires:       gnome-do-plugins = %{version}
-
-%description evolution
-gnome-do plugins for evolution
+GNOME Do plugin for Epiphany
 
 %package eog
 Summary:        GNOME Do Eye of Gnome plugin
@@ -90,7 +81,7 @@ Requires:       eog
 Requires:       gnome-do-plugins = %{version}
 
 %description eog
-gnome-do plugins for Eye of Gnome
+GNOME Do plugin for Eye of Gnome
 
 %package firefox
 Summary:        GNOME Do Firefox plugin
@@ -99,7 +90,7 @@ Requires:       firefox
 Requires:       gnome-do-plugins = %{version}
 
 %description firefox
-gnome-do plugins for firefox 
+GNOME Do plugin for Firefox 
 
 %package flickr
 Summary:        GNOME Do Flickr plugin
@@ -109,7 +100,7 @@ Requires:       flickrnet
 Requires:       gnome-do-plugins = %{version}
 
 %description flickr
-gnome-do plugins for flickr
+GNOME Do plugin for Flickr
 
 %package google
 Summary:        GNOME Do Google plugins
@@ -128,7 +119,16 @@ Requires:       pidgin
 Requires:       gnome-do-plugins = %{version}
 
 %description pidgin
-gnome-do plugins for pidgin 
+GNOME Do plugin for Pidgin
+
+%package qalculate
+Summary:        GNOME Do Qalculate plugin
+Group:          Applications/Productivity
+Requires:       qalculate
+Requires:       gnome-do-plugins = %{version}
+
+%description qalculate
+GNOME Do plugin for Qalculate
 
 %package rhythmbox
 Summary:        GNOME Do Rhythmbox plugin
@@ -137,7 +137,7 @@ Requires:       rhythmbox
 Requires:       gnome-do-plugins = %{version}
 
 %description rhythmbox
-gnome-do plugins for rhythmbox
+GNOME Do plugin for Rhythmbox
 
 %package tomboy
 Summary:        GNOME Do Tomboy plugin
@@ -146,7 +146,7 @@ Requires:       tomboy
 Requires:       gnome-do-plugins = %{version}
 
 %description tomboy
-gnome-do plugins for tomboy 
+GNOME Do plugin for Tomboy 
 
 %package thunderbird
 Summary:        GNOME Do Thunderbird plugin
@@ -155,7 +155,7 @@ Requires:       thunderbird
 Requires:       gnome-do-plugins = %{version}
 
 %description thunderbird
-gnome-do plugins for thunderbird
+GNOME Do plugin for Thunderbird
 
 %package tasque
 Summary:        GNOME Do Tasque plugin
@@ -164,7 +164,7 @@ Requires:       tasque
 Requires:       gnome-do-plugins = %{version}
 
 %description tasque
-gnome-do plugins for tasque
+GNOME Do plugin for Tasque
 
 %package vinagre
 Summary:        GNOME Do Vinagre plugin
@@ -173,7 +173,7 @@ Requires:       vinagre
 Requires:       gnome-do-plugins = %{version}
 
 %description vinagre
-gnome-do plugins for vinagre
+GNOME Do plugin for Vinagre
 
 
 %prep
@@ -182,7 +182,7 @@ gnome-do plugins for vinagre
 # build.rules.mk is imported into 70+ Makefile.in's
 # by Makefile.am.  Run autoreconf to regenerate the
 # Makefile.in's 
-autoreconf -i
+#autoreconf -i
 
 %build
 %configure 
@@ -192,12 +192,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-# This isn't the best solution.  We want to use the system library that's
-# installed on the end-user system instead of copying one in at build time.
-# Maybe a better solution would be to add %{_libdir}/banshee-1/ to the MONO_PATH
-# in %{_bindir}/gnome-do somehow.
-ln -sf %{_libdir}/banshee-1/Banshee.CollectionIndexer.dll %{buildroot}%{_libdir}/gnome-do/plugins
+# We don't need these copied libraries
 rm -rf %{buildroot}%{_datadir}/gnome-do/plugins/Banshee.CollectionIndexer.dll
+rm -rf %{buildroot}%{_libdir}/gnome-do/plugins/Banshee.CollectionIndexer.dll
 
 %find_lang %name
 
@@ -220,10 +217,6 @@ rm -rf %{buildroot}
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Epiphany*
 
-%files evolution
-%defattr(-, root, root,-)
-%{_libdir}/gnome-do/plugins/*Evolution*
-
 %files eog
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/EOG*
@@ -247,6 +240,10 @@ rm -rf %{buildroot}
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Pidgin*
 
+%files qalculate
+%defattr(-, root, root,-)
+%{_libdir}/gnome-do/plugins/Qalculate*
+
 %files rhythmbox
 %defattr(-, root, root,-)
 %{_libdir}/gnome-do/plugins/*Rhythmbox*
@@ -274,7 +271,6 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/gnome-do/plugins/*Bibtex*
 %exclude %{_libdir}/gnome-do/plugins/*ClawsMail*
 %exclude %{_libdir}/gnome-do/plugins/*Epiphany*
-%exclude %{_libdir}/gnome-do/plugins/*Evolution*
 %exclude %{_libdir}/gnome-do/plugins/EOG*
 %exclude %{_libdir}/gnome-do/plugins/*Firefox*
 %exclude %{_libdir}/gnome-do/plugins/*Flickr*
@@ -282,6 +278,7 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/gnome-do/plugins/GoogleContacts*
 %exclude %{_libdir}/gnome-do/plugins/GoogleDocs*
 %exclude %{_libdir}/gnome-do/plugins/*Pidgin*
+%exclude %{_libdir}/gnome-do/plugins/Qalculate*
 %exclude %{_libdir}/gnome-do/plugins/*Rhythmbox*
 %exclude %{_libdir}/gnome-do/plugins/*Tomboy*
 %exclude %{_libdir}/gnome-do/plugins/*Thunderbird*
@@ -291,6 +288,17 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-do/plugins/*
 
 %changelog
+* Fri Jul 15 2011 Theodore Lee <theo148 at gmail.com> - 0.8.4-2
+- Obsolete Evolution plugin
+
+* Tue Jun 28 2011 Theodore Lee <theo148 at gmail.com> - 0.8.4-1
+- Update to 0.8.4 release
+- Add Qalculate subpackage
+- Remove Evolution plugin (dropped upstream)
+- Fix subpackage descriptions and summaries
+- Enable GData plugins
+- Get rid of copied Banshee libraries completely
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 10411dd..59ac28d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32b88c062209e5b107602ccc5df285e7  gnome-do-plugins-0.8.2.1.tar.gz
+092b51b27463dc2beee65779d95a0ff1  gnome-do-plugins-0.8.4.tar.gz


More information about the scm-commits mailing list