packages: cpu-g/cpu-g.spec, cpu-g/cpu-g-datadir.patch (NEW) - rel.1 - added...

blues blues at pld-linux.org
Wed Jan 11 00:20:49 CET 2012


Author: blues                        Date: Tue Jan 10 23:20:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.1 - added datadir patch. works

---- Files affected:
packages/cpu-g:
   cpu-g.spec (1.1 -> 1.2) , cpu-g-datadir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cpu-g/cpu-g.spec
diff -u packages/cpu-g/cpu-g.spec:1.1 packages/cpu-g/cpu-g.spec:1.2
--- packages/cpu-g/cpu-g.spec:1.1	Wed Jan 11 00:03:35 2012
+++ packages/cpu-g/cpu-g.spec	Wed Jan 11 00:20:44 2012
@@ -2,11 +2,12 @@
 Summary:	Shows some useful information about your hardware
 Name:		cpu-g
 Version:	0.9.0
-Release:	0.1
+Release:	1
 License:	GPL v3
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/cpug/%{name}-%{version}.tar.gz
 # Source0-md5:	51b35a75331dc1067c6ed79b4861d346
+Patch0:		%{name}-datadir.patch
 URL:		http://sourceforge.net/projects/cpug/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.586
@@ -18,9 +19,8 @@
 Motherboard, some general information about your system and more. 
 
 %prep
-%setup -q 
-
-%build
+%setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/01/10 23:20:44  blues
+- rel.1 - added datadir patch. works
+
 Revision 1.1  2012/01/10 23:03:35  blues
 - initial
 

================================================================
Index: packages/cpu-g/cpu-g-datadir.patch
diff -u /dev/null packages/cpu-g/cpu-g-datadir.patch:1.1
--- /dev/null	Wed Jan 11 00:20:49 2012
+++ packages/cpu-g/cpu-g-datadir.patch	Wed Jan 11 00:20:44 2012
@@ -0,0 +1,40 @@
+--- ./cpu-g.org	2009-10-15 23:17:40.000000000 +0200
++++ ./cpu-g	2012-01-11 00:07:17.614787079 +0100
+@@ -52,7 +52,7 @@ class main:
+         model = self.cpuinfo("model", core)
+         vendor = self.cpuinfo("vendor", core)
+         
+-        path = 'data/logos/'
++        path = '/usr/share/cpu-g/data/logos/'
+         
+         if vendor == 'AMD':
+             label = 'amd.png'
+@@ -228,7 +228,7 @@ class CPUG:
+     """Description"""
+     
+     def __init__(self):
+-        self.gladefile = "cpu-g.glade"
++        self.gladefile = "/usr/share/cpu-g/cpu-g.glade"
+         self.wTree = gtk.Builder()
+         self.wTree.add_from_file(self.gladefile)
+         
+--- ./cpu-g.glade.org	2009-10-15 22:56:48.000000000 +0200
++++ ./cpu-g.glade	2012-01-11 00:07:58.479995869 +0100
+@@ -7,7 +7,7 @@
+     <property name="title" translatable="yes" comments="Window title">CPU-G</property>
+     <property name="default_width">460</property>
+     <property name="default_height">500</property>
+-    <property name="icon">data/cpu-g.png</property>
++    <property name="icon">/usr/share/cpu-g/data/cpu-g.png</property>
+     <signal name="destroy" handler="on_mainwindow_destroy"/>
+     <child>
+       <object class="GtkVBox" id="vbox1">
+@@ -1240,7 +1240,7 @@
+                 <child>
+                   <object class="GtkImage" id="abouticon">
+                     <property name="visible">True</property>
+-                    <property name="pixbuf">data/cpu-g.png</property>
++		    <property name="pixbuf">/usr/share/cpu-g/data/cpu-g.png</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpu-g/cpu-g.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list