SPECS: pykota.spec - added common package (user/group creation fo ...

[baggins]

Author: baggins                      Date: Sun Dec  9 10:45:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added common package (user/group creation fo now)

---- Files affected:
SPECS:
   pykota.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/pykota.spec
diff -u SPECS/pykota.spec:1.31 SPECS/pykota.spec:1.32
--- SPECS/pykota.spec:1.31	Sun Dec  9 11:39:51 2007
+++ SPECS/pykota.spec	Sun Dec  9 11:45:50 2007
@@ -37,11 +37,10 @@
 Requires:	python-PyPAM
 Requires:	python-pysnmp >= 3.4.2
 Requires:	python-ReportLab
-Requires:	%{name}-storage
+Requires:	%{name}-common = %{name}-%{version}-%{release}
+Requires:	%{name}-storage = %{name}-%{version}-%{release}
 Suggests:	net-snmp-utils >= 4.2.5
 Suggests:	netatalk
-Provides:	group(pykota)
-Provides:	user(pykota)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		cups_serverbin	%{_prefix}/lib/cups
@@ -53,11 +52,25 @@
 %description -l pl.UTF-8
 Narzędzie do limitowania i rozliczania wydruków.
 
+%package common
+Summary:	Common files for pykota
+Summary(pl.UTF-8):	Wspólne pliki dla pytkoty
+Group:		Applications/Printing
+Provides:	group(pykota)
+Provides:	user(pykota)
+
+%description
+Common files for pykota.
+
+%description -l pl.UTF-8
+Wspólne pliki dla pytkoty.
+
 %package storage-ldap
 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 = %{name}-%{version}-%{release}
 Provides:	%{name}-storage = %{name}-%{version}-%{release}
 
 %description storage-ldap
@@ -71,6 +84,7 @@
 Summary(pl.UTF-8):	Backend przechowywania danych w MySQL dla pykoty
 Group:		Applications/Printing
 Requires:	python-MySQLdb >= 1.2
+Requires:	%{name}-common = %{name}-%{version}-%{release}
 Provides:	%{name}-storage = %{name}-%{version}-%{release}
 
 %description storage-mysql
@@ -84,6 +98,7 @@
 Summary(pl.UTF-8):	Backend przechowywania danych w PostgreSQL dla pykoty
 Group:		Applications/Printing
 Requires:	python-PyGreSQL
+Requires:	%{name}-common = %{name}-%{version}-%{release}
 Provides:	%{name}-storage = %{name}-%{version}-%{release}
 
 %description storage-postgres
@@ -97,6 +112,7 @@
 Summary(pl.UTF-8):	Backend przechowywania danych w SQLite dla pykoty
 Group:		Applications/Printing
 Requires:	python-sqlite >= 2.0.5
+Requires:	%{name}-common = %{name}-%{version}-%{release}
 Provides:	%{name}-storage = %{name}-%{version}-%{release}
 
 %description storage-sqlite
@@ -171,11 +187,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pre common
 %groupadd -r -g 193 pykota
 %useradd -r -u 193 -d /etc/%{name} -s /bin/false -c "PyKota User" -g pykota pykota
 
-%postun
+%postun common
 if [ "$1" = "0" ]; then
 	%userremove %{name}
 	%groupremove %{name}
@@ -200,9 +216,7 @@
 %attr(640,pykota,pykota) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/pykota.conf
 %attr(600,pykota,pykota) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/pykotadmin.conf
 %attr(755,root,root) %{_bindir}/*
-%dir %{py_sitescriptdir}/%{name}
 %{py_sitescriptdir}/%{name}/*.py[co]
-%dir %{py_sitescriptdir}/%{name}/storages
 %{py_sitescriptdir}/%{name}/storages/__init__.py[co]
 %{py_sitescriptdir}/%{name}/storages/sql.py[co]
 %dir %{py_sitescriptdir}/%{name}/reporters
@@ -242,6 +256,11 @@
 #%lang(tr) %{_mandir}/tr/man?/*
 #%lang(zh_TW) %{_mandir}/zh_TW/man?/*
 
+%files common
+%defattr(644,root,root,755)
+%dir %{py_sitescriptdir}/%{name}
+%dir %{py_sitescriptdir}/%{name}/storages
+
 %files storage-ldap
 %defattr(644,root,root,755)
 %{py_sitescriptdir}/%{name}/storages/ldap*.py[co]
@@ -274,6 +293,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2007-12-09 10:45:50  baggins
+- added common package (user/group creation fo now)
+
 Revision 1.31  2007-12-09 10:39:51  baggins
 - create user in pre
 
================================================================

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