rpms/smolt/EL-5 smolt-1.2-install.patch, NONE, 1.1 smolt-1.2-python24.patch, NONE, 1.1 smolt.spec, 1.33, 1.34

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/smolt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4579

Modified Files:
	smolt.spec 
Added Files:
	smolt-1.2-install.patch smolt-1.2-python24.patch 
Log Message:
* Wed Dec 3 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-2
- Add missing file to client
- Fix run with python 2.4 in RHEL-5


smolt-1.2-install.patch:

--- NEW FILE smolt-1.2-install.patch ---
>From 003aebbc5a3c0076ca2a2967defab911493c7781 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 3 Dec 2008 14:05:38 +0100
Subject: [PATCH] Fix installation

Add os_detect.py, which is vital for the client, and fix the file
permissions.
---
 client/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 1161bb5..d4516d4 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -2,7 +2,7 @@ PO_FILES=$(wildcard po/*.po)
 MO_FILES=$(patsubst %.po,%.mo,$(PO_FILES))
 PY_FILES=fs_util.py deleteProfile.py haldump.py __init__.py sendProfile.py smoltGui.py smolt.py software.py smoltFirstBoot.py gui.py privacypolicy.py scan.py
 DIRED_MO_FILES=$(patsubst po/%.mo,mo/%/LC_MESSAGES/$(NAME).mo,$(MO_FILES))
-CLIENT_FILES=fs_util.py deleteProfile.py gui.py haldump.py i18n.py privacypolicy.py sendProfile.py smolt.py smoltGui.py software.py scan.py
+CLIENT_FILES=fs_util.py deleteProfile.py gui.py haldump.py i18n.py privacypolicy.py sendProfile.py smolt.py smoltGui.py software.py scan.py os_detect.py
 
 
 NAME=smolt
@@ -40,7 +40,7 @@ install-main: move-mo
 	
 	install -d -m 0755 ./ $(DATADIR)/$(NAME)/client/
 	install -d -m 0755 icons/ $(DATADIR)/$(NAME)/client/icons/
-	cp -adv $(CLIENT_FILES) $(DATADIR)/$(NAME)/client/
+	install -p -m 0644 $(CLIENT_FILES) $(DATADIR)/$(NAME)/client/
 	
 	
 	mkdir -p $(DATADIR)/icons/hicolor/16x16/apps/
-- 
1.5.5.1


smolt-1.2-python24.patch:

--- NEW FILE smolt-1.2-python24.patch ---
>From 250748e0b7a2f1ad96e2a828673b52002549908d Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 3 Dec 2008 14:04:56 +0100
Subject: [PATCH] Fix profile submit with Python 2.4

urlparse() doesn't provide both hostname and the convenience
attributes at all. No big deal -- netloc is obviously sufficient here.
---
 client/smolt.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/smolt.py b/client/smolt.py
index 823f107..fd9c41d 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -432,7 +432,7 @@ class Hardware:
 
     def write_pub_uuid(self,smoonURL,pub_uuid,pub_uuid_file):
         smoonURLparsed=urlparse(smoonURL)
-        pub_uuid_file += ("-"+smoonURLparsed.hostname)
+        pub_uuid_file += ("-"+smoonURLparsed[1])
         try:
             file(pub_uuid_file, 'w').write(pub_uuid)
         except Exception, e:
@@ -442,7 +442,7 @@ class Hardware:
 
     def write_admin_token(self,smoonURL,admin,admin_token_file):
         smoonURLparsed=urlparse(smoonURL)
-        admin_token_file += ("-"+smoonURLparsed.hostname)
+        admin_token_file += ("-"+smoonURLparsed[1])
         try:
             file(admin_token_file, 'w').write(admin)
         except Exception, e:
-- 
1.5.5.1



Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- smolt.spec	30 Nov 2008 19:57:26 -0000	1.33
+++ smolt.spec	3 Dec 2008 13:11:41 -0000	1.34
@@ -1,11 +1,13 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
+Patch0: smolt-1.2-install.patch
+Patch1: smolt-1.2-python24.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -65,6 +67,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .install
+%patch1 -p1 -b .python24
 
 %build
 cd client/
@@ -175,6 +179,10 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Wed Dec 3 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-2
+- Add missing file to client
+- Fix run with python 2.4 in RHEL-5
+
 * Sun Nov 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.2-1
 - Upstream released new version