SPECS: pykota.spec - unified License format - use versioned -stora...

[qboosh]

Author: qboosh                       Date: Wed Dec 12 17:46:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified License format
- use versioned -storage Provides as Requires are versioned too

---- Files affected:
SPECS:
   pykota.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/pykota.spec
diff -u SPECS/pykota.spec:1.43 SPECS/pykota.spec:1.44
--- SPECS/pykota.spec:1.43	Tue Dec 11 18:32:09 2007
+++ SPECS/pykota.spec	Wed Dec 12 18:46:00 2007
@@ -1,19 +1,19 @@
 # $Revision$, $Date$
 #
 # NOTE:
-#	- only apache is supprted (feel free to add support for other httpds)
+#	- only apache is supported (feel free to add support for other httpds)
 #	- CGI scripts must be run with uid/gid pykota/pykota privs
 #	- that's why they're placed in /home/services/httpd/cgi-bin (suexec req)
 #
 # Conditional build:
 %bcond_without	doc	# don't build HTML/PDF documentation
-
-Name:		pykota
+#
 Summary:	Print Quota and Accounting Software Solution
 Summary(pl.UTF-8):	Narzędzie do limitowania i rozliczania wydruków
+Name:		pykota
 Version:	1.26
 Release:	2
-License:	GPLv2
+License:	GPL v2
 Group:		Applications/Printing
 # NOTE: from svn:
 # svn co svn://svn.librelogiciel.com/pykota/tags/1.26/
@@ -33,23 +33,23 @@
 BuildRequires:	tetex-latex-cyrillic
 %endif
 BuildRequires:	sqlite3
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	%{name}-storage = %{version}-%{release}
 Requires:	cups >= 1:1.2.0
 Requires:	ghostscript
+Requires:	python-PIL
+Requires:	python-PyPAM
+Requires:	python-ReportLab
 Requires:	python-chardet
-Requires:	python-pkipplib
 Requires:	python-jaxml
 Requires:	python-mx-DateTime >= 2.0.3
-Requires:	python-PIL
+Requires:	python-pkipplib
 Requires:	python-pkpgcounter
 %ifarch %{ix86}
 Requires:	python-psyco
 %endif
 Requires:	python-pyosd
-Requires:	python-PyPAM
 Requires:	python-pysnmp >= 3.4.2
-Requires:	python-ReportLab
-Requires:	%{name}-common = %{version}-%{release}
-Requires:	%{name}-storage = %{version}-%{release}
 Suggests:	net-snmp-utils >= 4.2.5
 Suggests:	netatalk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -83,9 +83,9 @@
 Summary:	CGI interface for pykota
 Summary(pl.UTF-8):	Interfejs CGI dla pytkoty
 Group:		Applications/Printing
+Requires:	%{name} = %{version}-%{release}
 Requires:	webapps
 Requires:	webserver
-Requires:	%{name} = %{version}-%{release}
 
 %description cgi
 CGI interface for pykota.
@@ -97,9 +97,9 @@
 Summary:	LDAP storage backend for pykota
 Summary(pl.UTF-8):	Backend przechowywania danych w LDAP dla pykoty
 Group:		Applications/Printing
-Requires:	python-ldap
 Requires:	%{name}-common = %{version}-%{release}
-Provides:	%{name}-storage
+Requires:	python-ldap
+Provides:	%{name}-storage = %{version}-%{release}
 
 %description storage-ldap
 LDAP storage backend for pykota.
@@ -111,9 +111,9 @@
 Summary:	MySQL storage backend for pykota
 Summary(pl.UTF-8):	Backend przechowywania danych w MySQL dla pykoty
 Group:		Applications/Printing
-Requires:	python-MySQLdb >= 1.2
 Requires:	%{name}-common = %{version}-%{release}
-Provides:	%{name}-storage
+Requires:	python-MySQLdb >= 1.2
+Provides:	%{name}-storage = %{version}-%{release}
 
 %description storage-mysql
 MySQL storage backend for pykota.
@@ -125,9 +125,9 @@
 Summary:	PostgreSQL storage backend for pykota
 Summary(pl.UTF-8):	Backend przechowywania danych w PostgreSQL dla pykoty
 Group:		Applications/Printing
-Requires:	python-PyGreSQL
 Requires:	%{name}-common = %{version}-%{release}
-Provides:	%{name}-storage
+Requires:	python-PyGreSQL
+Provides:	%{name}-storage = %{version}-%{release}
 
 %description storage-postgres
 PostgreSQL storage backend for pykota.
@@ -139,9 +139,9 @@
 Summary:	SQLite storage backend for pykota
 Summary(pl.UTF-8):	Backend przechowywania danych w SQLite dla pykoty
 Group:		Applications/Printing
-Requires:	python-sqlite >= 2.0.5
 Requires:	%{name}-common = %{version}-%{release}
-Provides:	%{name}-storage
+Requires:	python-sqlite >= 2.0.5
+Provides:	%{name}-storage = %{version}-%{release}
 
 %description storage-sqlite
 SQLite storage backend for pykota.
@@ -307,7 +307,7 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
 %attr(755,pykota,pykota) %dir %{httpdir}/cgi-bin/%{name}
 %attr(755,pykota,pykota) %{httpdir}/cgi-bin/%{name}/*.cgi
-%attr(644,root,root) %{httpdir}/cgi-bin/%{name}/*.css
+%{httpdir}/cgi-bin/%{name}/*.css
 
 %files common
 %defattr(644,root,root,755)
@@ -346,6 +346,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2007-12-12 17:46:00  qboosh
+- unified License format
+- use versioned -storage Provides as Requires are versioned too
+
 Revision 1.43  2007-12-11 17:32:09  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pykota.spec?r1=1.43&r2=1.44&f=u