- rel.1 - added datadir patch. works

Changed files:
    cpu-g-datadir.patch -> 1.1
    cpu-g.spec -> 1.2

diff --git a/cpu-g-datadir.patch b/cpu-g-datadir.patch
new file mode 100644 (file)
index 0000000..581ef16
--- /dev/null
+++ b/cpu-g-datadir.patch
@@ -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>

diff --git a/cpu-g.spec b/cpu-g.spec
index 4cca7a5e2ecdbd32242784a858195b6cee0ce5a4..83ccf709c44515eb5c0359fb817512f61a971ad2 100644 (file)
--- a/cpu-g.spec
+++ b/cpu-g.spec
@@ -1,11 +1,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
@@ -17,9 +18,8 @@ hardware. It collects and displays information about your CPU, RAM,
 Motherboard, some general information about your system and more. 
 
 %prep
-%setup -q 
-
-%build
+%setup -q
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT