[gnome-do] Update to latest upstream version
Theodore Lee
antiaircraft at fedoraproject.org
Sat Jul 16 03:24:49 UTC 2011
commit ff935ca354fe5dbabb2118a4373a0acf214dd9a4
Author: Theodore Lee <theo148 at gmail.com>
Date: Sat Jul 16 11:24:19 2011 +0800
Update to latest upstream version
gnome-do-0.8.2-nodocky.patch | 55 --------------------------
gnome-do-0.8.2-nozoom.patch | 42 --------------------
gnome-do-0.8.3.1-gdk-build-fix.patch | 22 -----------
gnome-do-0.8.3.1-mono-2.8.patch | 70 ----------------------------------
gnome-do-0.8.5-xargs.patch | 12 ++++++
gnome-do.spec | 69 +++++++++++++++++++++------------
6 files changed, 56 insertions(+), 214 deletions(-)
---
diff --git a/gnome-do-0.8.5-xargs.patch b/gnome-do-0.8.5-xargs.patch
new file mode 100644
index 0000000..1378f24
--- /dev/null
+++ b/gnome-do-0.8.5-xargs.patch
@@ -0,0 +1,12 @@
+--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentService.cs.orig 2011-05-05 18:41:30.000000000 +0800
++++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/EnvironmentService.cs 2011-07-16 10:32:47.694228533 +0800
+@@ -123,7 +123,8 @@
+ foreach (string argument in arguments) {
+ executor.StandardInput.Write ("{0}\0", argument);
+ }
+- Log<EnvironmentService>.Debug ("Executing command “{0}”", arguments.Aggregate ((cur, item) => cur + " " + item));
++ executor.StandardInput.Close ();
++ Log<EnvironmentService>.Debug ("Executing command “{0} {1}”", command, arguments.Aggregate ((cur, item) => cur + " " + item));
+ return executor;
+ }
+
diff --git a/gnome-do.spec b/gnome-do.spec
index a37cdce..c3bfdbf 100644
--- a/gnome-do.spec
+++ b/gnome-do.spec
@@ -1,23 +1,18 @@
-%define debug_package %{nil}
-%define mainver 0.8.3
+%global debug_package %{nil}
+%global mainver 0.8.5
Name: gnome-do
-Version: 0.8.3.1
-Release: 5%{?dist}
+Version: %{mainver}
+Release: 3%{?dist}
Summary: Quick launch and search
License: GPLv3+
Group: Applications/File
URL: http://do.davebsd.com/
-#http://launchpad.net/do/0.8/0.8.3/+download/gnome-do-0.8.3.1.tar.gz
-Source0: http://launchpad.net/do/0.8/%{mainver}/+download/gnome-do-%{version}.tar.gz
-
-# The "Icon Magnification" was removed from "Docky" due to a potential violation of US Patent 7434177
-Patch0: gnome-do-0.8.2-nozoom.patch
-# https://bugs.launchpad.net/do/+bug/634556
-# https://bugs.launchpad.net/do/+bug/634550
-Patch1: gnome-do-0.8.3.1-mono-2.8.patch
-Patch2: gnome-do-0.8.3.1-gdk-build-fix.patch
+# http://launchpad.net/do/trunk/0.8.5/+download/gnome-do-0.8.5.tar.gz
+Source0: http://launchpad.net/do/trunk/%{mainver}/+download/gnome-do-%{version}.tar.gz
+# https://bugs.launchpad.net/do/+bug/811366
+Patch0: gnome-do-0.8.5-xargs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,15 +31,17 @@ BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
Requires: mono(NDesk.DBus.GLib) = 1.0.0.0
-Requires: gnome-keyring-sharp, gnome-desktop-sharp
+Requires: gnome-keyring-sharp, gnome-desktop-sharp, findutils
Requires: pkgconfig
# Mono only available on these:
-ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
+
+Obsoletes: gnome-do-docklets < 0.8.5-1%{?dist}
%description
GNOME Do (Do) is an intelligent launcher tool that makes performing
@@ -65,9 +62,8 @@ Development files for GNOME Do
%prep
%setup -q
-%patch0 -p1 -b .nozoom
-%patch1 -p0 -b .mono28-fix
-%patch2 -p1 -b .gdkbuild-fix
+
+%patch0 -p0 -z .xargs
%build
%configure
@@ -79,14 +75,14 @@ rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
+desktop-file-install \
--dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
--add-only-show-in=GNOME \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-do.desktop
-desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
#own this dir:
@@ -144,6 +140,29 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*
%changelog
+* Sat Jul 16 2011 Theodore Lee <theo148 at gmail.com> - 0.8.5-3
+- Add patch for minor ExecuteWithArguments bugs
+
+* Fri Jul 15 2011 Theodore Lee <theo148 at gmail.com> - 0.8.5-2
+- Add requires on findutils (for xargs)
+- Obsolete docklets
+
+* Tue Jun 28 2011 Theodore Lee <theo148 at gmail.com> - 0.8.5-1
+- Update to latest upstream release
+- Use global instead of define
+- Drop patches for issues that have been fixed upstream
+
+* Sun Mar 13 2011 Theodore Lee <theo148 at gmail.com> - 0.8.4-0.3.aa
+- Update patch for opening weird filenames
+
+* Fri Mar 11 2011 Theodore Lee <theo148 at gmail.com> - 0.8.4-0.2.aa
+- Add unreleased fixes for opening weird filenames and the email action
+
+* Fri Dec 10 2010 Theodore Lee <theo148 at gmail.com> - 0.8.4-0.1.aa
+- Updated to latest upstream release, which has dropped Docky
+- Remove unnecessary Docky patch
+- Add patch to get rid of linebreak in desktop file
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list