merged changes from trunk - spec files harmonized

diff --git a/nozomi.spec b/nozomi.spec
index fd15e9e..08e8cb7 100644 (file)
--- a/nozomi.spec
+++ b/nozomi.spec
@@ -7,24 +7,28 @@
 # Copyright (C) 2006 The Trustees of Princeton University
 # License is GPL.
 #
-# $Id:$
+# $Id$
 #
 
 %define name nozomi
-%define version 2.21alpha_060917
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.21
+%define subversion alpha_060917
 
-Summary: nozomi
+%define release %{subversion}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
+Summary: nozomi UMTS driver
 Name: %{name}
 Version: %{version}
 Release: %{release}
 License: GPL
 Group: System Environment/Kernel
+Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-Source0: nozomi-%{version}.tar.bz2
-
+Vendor: OneLab
 URL: http://www.pharscape.org/component/option,com_forum/Itemid,68/
+Packager: OneLab <support@one-lab.org>
+Distribution: OneLab 4.0
 
 %description
 nozomi is a UMTS card driver