rpms/gdesklets/F-7 .cvsignore, 1.5, 1.6 gdesklets.spec, 1.32, 1.33 sources, 1.5, 1.6 transition.patch, 1.3, 1.4

[Luya Tshimbalanga (luya)]

Author: luya

Update of /cvs/pkgs/rpms/gdesklets/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20146

Modified Files:
	.cvsignore gdesklets.spec sources transition.patch 
Log Message:
update from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Nov 2007 08:50:22 -0000	1.5
+++ .cvsignore	27 Feb 2008 22:34:33 -0000	1.6
@@ -1,2 +1 @@
-gDesklets-0.35.4.tar.bz2
-gDesklets-0.36beta.tar.bz2
+gdesklets-0.36.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-7/gdesklets.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gdesklets.spec	23 Nov 2007 19:46:19 -0000	1.32
+++ gdesklets.spec	27 Feb 2008 22:34:33 -0000	1.33
@@ -1,17 +1,17 @@
-%define alphatag beta
+#%define alphatag beta
 
 Name:		gdesklets
 Version:	0.36
-Release:	0.3.%{alphatag}%{?dist}
+Release:	1%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
 License:	GPL+
 
 URL:		http://www.gdesklets.de/
-Source0:	http://students.fim.uni-passau.de/~meyerc/gDesklets/gDesklets-%{version}%{alphatag}.tar.bz2
+Source0:	http://gdesklets.de/files/gdesklets-%{version}.tar.bz2
 Patch0:		transition.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}%{alphatag}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
@@ -29,7 +29,7 @@
 
 
 %prep
-%setup -q -n gDesklets-%{version}%{alphatag}
+%setup -q -n gdesklets-%{version}
 %patch0 -p1 -b .transition
 
 %build
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Feb 27 2008 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36-1
+- Update from upstream
+
 * Thu Nov 15 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36.0-3.beta
 - Changed url adress
 - Added patch for dialog


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2007 08:50:22 -0000	1.5
+++ sources	27 Feb 2008 22:34:33 -0000	1.6
@@ -1,2 +1 @@
-2b4318ed80d451afd38a9f235dfb400a  gDesklets-0.35.4.tar.bz2
-f40a842015790fc5a31e40f5d5216d14  gDesklets-0.36beta.tar.bz2
+766727f18f904968b622e7696fc9199b  gdesklets-0.36.tar.bz2

transition.patch:

Index: transition.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-7/transition.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transition.patch	23 Nov 2007 19:46:19 -0000	1.3
+++ transition.patch	27 Feb 2008 22:34:33 -0000	1.4
@@ -1,20 +1,15 @@
-*** gDesklets-0.36beta/main/transition.py	2007-10-04 04:22:11.000000000 -0700
---- gDesklets-0.36beta_copy/main/transition.py	2007-11-23 10:56:44.000000000 -0800
-***************
-*** 45,51 ****
-                  "stable release version, we'd highly appreciate it if you "
-                  "report any weird behavior to the developers.\n\n"
-                  "Experienced users are encouraged to try a bzr version, "
-!                 "though!")
-  
-      elif ("rc" in VERSION):
-          msg = _("This is a <b>release candidate</b> of an upcoming gDesklets "
---- 45,52 ----
-                  "stable release version, we'd highly appreciate it if you "
-                  "report any weird behavior to the developers.\n\n"
-                  "Experienced users are encouraged to try a bzr version, "
-!                 "though! \n\n"
-! 		"This message can be ignored as the packagers deliver the latest known working version.")
-  
-      elif ("rc" in VERSION):
-          msg = _("This is a <b>release candidate</b> of an upcoming gDesklets "
+diff -up gdesklets-0.36/main/transition.py.context gdesklets-0.36/main/transition.py
+--- gdesklets-0.36/main/transition.py.context	2008-02-23 00:44:31.000000000 -0800
++++ gdesklets-0.36/main/transition.py	2008-02-23 00:44:52.000000000 -0800
+@@ -65,10 +65,7 @@ if (not _check_version()):
+                 "you press that key again!\n"
+                 "The default keybinding is <Shift> <F12>, "
+                 "but you can easily change that in the configuration "
+-                "dialog.\n\n"
+-                "Please note that due to limitations of older X servers, "
+-                "you might see blocks around desklets in Float mode. "
+-                "This cannot be solved in a satisfying way.")
++                "dialog.\n\n")
+ 
+     # show the dialog
+     dialog.info(