================================
system-config-date:source=1.7.18-0.1 (previous: 1.7.99.3-0.1)
cvc rdiff system-config-date -1 /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.7.18-0.1
================================
1.7.18-0.1 Ken VanDine ([EMAIL PROTECTED]) Thu Jun  8 12:55:20 2006
    Merged back from rpl:1
    
system-config-date-1.7.18.tar.bz2: new
system-config-date.recipe: changed
Index: system-config-date.recipe
====================================================================
contents(size sha1)
inode(mtime owner group)
--- system-config-date.recipe /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.7.99.3-0.1
+++ system-config-date.recipe /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.7.18-0.1
@@ -1,31 +1,38 @@
 #
-# Copyright (c) 2004 Specifix, Inc.
-# All rights reserved
+# Copyright (c) 2004-2005 rPath, Inc.
+# This file is distributed under the terms of the MIT License.
+# A copy is available at http://www.rpath.com/permanent/mit-license.html
 #
 
 class SystemConfigDate(PackageRecipe):
+    name = 'system-config-date'
+    version = '1.7.18'
+
     buildRequires = [ 'desktop-file-utils:runtime', 'intltool:runtime' ]
-    name = "system-config-date"
-    version = "1.7.99.3"
 
     def setup(r):
-        r.addArchive('%(name)s-%(version)s.tar.bz2',
-            
rpm='ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core/development/SRPMS/%(name)s-%(version)s-1.src.rpm')
+        r.addArchive('%(name)s-%(version)s.tar.bz2')
+        #r.addArchive('%(name)s-%(version)s.tar.bz2',
+        #    
rpm='ftp://ftp.linux.ncsu.edu/pub/fedora/linux/core/development/SRPMS/%(name)s-%(version)s-1.src.rpm')
 
-        r.Replace('python2', 'python', 'system-config-date', 'timeconfig',
-                  'src/system-config-date.py', 'src/timeconfig.py')
-       r.Replace('Exec=','Exec=gksudo ','system-config-date.desktop.in')
-       
r.Replace('Categories=Application;SystemSetup;','Categories=Application;System;Settings','system-config-date.desktop.in')
+        r.Replace('python2', 'python', 'system-config-date', 'timeconfig', 
'src/system-config-date.py', 'src/timeconfig.py')
+        r.Replace('Exec=','Exec=gksudo ','system-config-date.desktop.in')
+        
r.Replace('Categories=Application;SystemSetup;','Categories=Application;System;Settings','system-config-date.desktop.in')
+
         r.Make()
         r.MakeInstall()
+
         # fix up packaging error
         r.Remove('%(bindir)s/timetool')
+        r.Symlink('system-config-date', '%(bindir)s/timetool')
+
         # we depend on ntp, which provides this file
         r.Remove('%(sysconfdir)s/ntp/ntpservers')
-        r.Symlink('system-config-date', '%(bindir)s/timetool')
+
+        # r.DesktopFile adds a prefix on install, so remove the duplicated 
.desktop file
+        r.Desktopfile('system-config-date.desktop')
+        r.Remove('%(datadir)s/applications/system-config-date.desktop')
 
         for trove in ('ntp:runtime', 'rhpl:python', 'chkconfig:runtime',
                       'pygtk:python', 'newt:python', 'htmlview:runtime'):
             r.Requires(trove, '%(bindir)s/system-config-date')
-
-       r.Remove('%(datadir)s/applications/system-config-date.desktop')


system-config-date-1.7.99.3.tar.bz2: removed

Committed by: krv
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits

Reply via email to