[gnome-shell-extension-pidgin/f16] sync with latest git tree, more correct 3.2 fixes
Tom Callaway
spot at fedoraproject.org
Fri Oct 7 18:03:44 UTC 2011
commit f514501dc436451569fc94746d6bec0696f8ec6e
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Fri Oct 7 14:03:42 2011 -0400
sync with latest git tree, more correct 3.2 fixes
.gitignore | 1 +
gnome-shell-extension-pidgin-fix-metadata.patch | 24 +++++-----------------
gnome-shell-extension-pidgin.spec | 11 +++++----
sources | 2 +-
4 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c9c142..36760c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gnome-shell-extension-pidgin-git4ca78b1.tar.bz2
+/gnome-shell-extension-pidgin-git80d4ea4b59.tar.bz2
diff --git a/gnome-shell-extension-pidgin-fix-metadata.patch b/gnome-shell-extension-pidgin-fix-metadata.patch
index d58a94b..cde1621 100644
--- a/gnome-shell-extension-pidgin-fix-metadata.patch
+++ b/gnome-shell-extension-pidgin-fix-metadata.patch
@@ -1,23 +1,11 @@
diff -up gnome-shell-extension-pidgin/extension.js.fix-metadata gnome-shell-extension-pidgin/extension.js
---- gnome-shell-extension-pidgin/extension.js.fix-metadata 2011-06-06 10:05:13.622748109 -0400
-+++ gnome-shell-extension-pidgin/extension.js 2011-06-06 10:05:38.992430943 -0400
-@@ -365,6 +365,6 @@ PidginClient.prototype = {
-
+--- gnome-shell-extension-pidgin/extension.js.fix-metadata 2011-10-07 13:56:06.000000000 -0400
++++ gnome-shell-extension-pidgin/extension.js 2011-10-07 13:59:44.013711493 -0400
+@@ -475,6 +475,6 @@ PidginClient.prototype = {
+ }
- function main(metadata) {
+ function init(metadata) {
- imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+ // imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
- let client = new PidginClient();
- }
-diff -up gnome-shell-extension-pidgin/metadata.json.fix-metadata gnome-shell-extension-pidgin/metadata.json
---- gnome-shell-extension-pidgin/metadata.json.fix-metadata 2011-05-25 00:01:37.000000000 -0400
-+++ gnome-shell-extension-pidgin/metadata.json 2011-06-06 09:58:37.588711168 -0400
-@@ -2,7 +2,7 @@
- "uuid": "pidgin at gnome-shell-extensions.gnome.org",
- "name": "Pidgin IM Integration",
- "description": "Display Pidgin chats as notifications in the Shell message tray.",
-- "shell-version": [ "3.0.1" ],
-+ "shell-version": [ "3.0" ],
- "localedir": "/usr/share/locale",
- "url": "https://github.com/kagesenshi/gnome-shell-extensions-pidgin"
+ return new PidginClient();
}
diff --git a/gnome-shell-extension-pidgin.spec b/gnome-shell-extension-pidgin.spec
index a025696..482c252 100644
--- a/gnome-shell-extension-pidgin.spec
+++ b/gnome-shell-extension-pidgin.spec
@@ -1,16 +1,16 @@
-%global git 4ca78b1
+%global git 80d4ea4b59
%global uuid pidgin at gnome-shell-extensions.gnome.org
Name: gnome-shell-extension-pidgin
Version: 0
-Release: 0.4.git%{git}%{?dist}
+Release: 0.5.git%{git}%{?dist}
Summary: The components necessary to integrate Pidgin with GNOME Shell
Group: User Interface/Desktops
License: GPLv2+
URL: https://github.com/kagesenshi/gnome-shell-extensions-pidgin
# git clone https://github.com/kagesenshi/gnome-shell-extensions-pidgin.git
# mv gnome-shell-extensions-pidgin gnome-shell-extension-pidgin
-# tar cfj gnome-shell-extension-pidgin-git4ca78b1.tar.bz2 gnome-shell-extension-pidgin
+# tar cfj gnome-shell-extension-pidgin-git80d4ea4b59.tar.bz2 gnome-shell-extension-pidgin
Source0: %{name}-git%{git}.tar.bz2
Source1: http://download.sourceforge.net/project/gnomeshpidgin/gnomeShellPidgin.c
Source2: Makefile.gnomeShellPidgin
@@ -20,7 +20,6 @@ Source3: gnome-shell-extensions-pidgin-License.txt
Source4: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
Patch0: gnomeShellPidgin-cleanup.patch
Patch1: gnome-shell-extension-pidgin-fix-metadata.patch
-Patch2: gnome-shell-extension-pidgin-gnome-shell-32.patch
BuildRequires: libpurple-devel, dbus-devel, zlib-devel
Requires: gnome-shell >= 3.0.1
Requires: pidgin
@@ -45,7 +44,6 @@ cp %{SOURCE3} .
cp %{SOURCE4} .
%patch0 -p0 -b .cleanup
%patch1 -p1 -b .fix-metadata
-%patch2 -p1 -b .32fix
%build
make CFLAGS="%{optflags}"
@@ -63,6 +61,9 @@ install -Dp -m 0644 {extension.js,metadata.json} \
%{_libdir}/purple-2/libgnomeshell.so
%changelog
+* Fri Oct 7 2011 Tom Callaway <spot at fedoraproject.org> - 0-0.5.git80d4ea4b59
+- update to the latest code with more proper 3.2 fixes
+
* Sun Oct 2 2011 Tom Callaway <spot at fedoraproject.org> - 0-0.4.git4ca78b1
- fix metadata version to be 3.2
diff --git a/sources b/sources
index 25c382b..99cb584 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2267235a4e7efdd73a2557b107cd9e64 gnome-shell-extension-pidgin-git4ca78b1.tar.bz2
+0bb2d165cd9e1bcd7102bec7f9854cd4 gnome-shell-extension-pidgin-git80d4ea4b59.tar.bz2
More information about the scm-commits
mailing list