SPECS: webmin.spec - added provides to be able to fine tune inner ...

[glen]

Author: glen                         Date: Sat Mar 25 14:27:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added provides to be able to fine tune inner module deps
- oh, and shell.lang was in wrong package

---- Files affected:
SPECS:
   webmin.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/webmin.spec
diff -u SPECS/webmin.spec:1.78 SPECS/webmin.spec:1.79
--- SPECS/webmin.spec:1.78	Sat Mar 25 15:07:53 2006
+++ SPECS/webmin.spec	Sat Mar 25 15:27:02 2006
@@ -6,7 +6,7 @@
 Summary(pl):	Webmin - administracja przez WWW
 Name:		webmin
 Version:	1.260
-Release:	1.7
+Release:	1.8
 License:	BSD-like
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/webadmin/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch2:		%{name}-software-poldek.patch
 Patch3:		%{name}-quote.patch
 URL:		http://www.webmin.com/
+BuildRequires:	/etc/pld-release
 BuildRequires:	perl-CGI
 BuildRequires:	perl-Compress-Zlib
 BuildRequires:	perl-DBI
@@ -29,11 +30,16 @@
 BuildRequires:	perl-modules
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	/etc/pld-release
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	perl-modules
 Requires:	policy
+Provides:	%{name}-acl = %{version}-%{release}
+Provides:	%{name}-man = %{version}-%{release}
+Provides:	%{name}-pam = %{version}-%{release}
+Provides:	%{name}-servers = %{version}-%{release}
+Provides:	%{name}-time = %{version}-%{release}
+Provides:	%{name}-webmin = %{version}-%{release}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,6 +62,8 @@
 Requires:	%{name}-system = %{version}-%{release}
 Requires:	fdisk
 Requires:	hdparm
+Provides:	%{name}-fdisk = %{version}-%{release}
+Provides:	%{name}-raid = %{version}-%{release}
 
 %description disk-tools
 Webmin - Partition and disk management tools.
@@ -694,6 +702,7 @@
 Group:		Applications/System
 Requires(post):	%{name} = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-mount = %{version}-%{release}
 Requires:	lvm2
 
 %description lvm
@@ -1262,6 +1271,11 @@
 Group:		Applications/System
 Requires(post):	%{name} = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-custom = %{version}-%{release}
+Provides:	%{name}-file = %{version}-%{release}
+Provides:	%{name}-shell = %{version}-%{release}
+Provides:	%{name}-telnet = %{version}-%{release}
+Provides:	%{name}-webminlog = %{version}-%{release}
 
 %description admin-tools
 Webmin - Admin-tools (telnet, file manager, etc).
@@ -1277,6 +1291,10 @@
 Group:		Applications/System
 Requires(post):	%{name} = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-init = %{version}-%{release}
+Provides:	%{name}-inittab = %{version}-%{release}
+Provides:	%{name}-mount = %{version}-%{release}
+Provides:	%{name}-proc = %{version}-%{release}
 
 %description system
 Webmin - System Configuration.
@@ -1447,6 +1465,7 @@
 
 rm -f *.lang
 cp -a * $RPM_BUILD_ROOT%{_datadir}/webmin
+rm -f $RPM_BUILD_ROOT%{_datadir}/webmin/perlpath.pl
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/webmin
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/webmin/miniserv.conf
@@ -1487,10 +1506,10 @@
 done
 sh %{SOURCE3} $RPM_BUILD_ROOT %{_datadir}/webmin MAIN
 
-cat custom.lang file.lang telnet.lang webminlog.lang > admin-tools.lang
+cat custom.lang file.lang telnet.lang webminlog.lang shell.lang > admin-tools.lang
 cat fdisk.lang raid.lang > disk-tools.lang
 cat init.lang inittab.lang mount.lang proc.lang > system.lang
-cat MAIN.lang acl.lang man.lang pam.lang servers.lang shell.lang \
+cat MAIN.lang acl.lang man.lang pam.lang servers.lang \
 	time.lang webmin.lang > base.lang
 
 %clean
@@ -3384,6 +3403,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2006/03/25 14:27:02  glen
+- added provides to be able to fine tune inner module deps
+- oh, and shell.lang was in wrong package
+
 Revision 1.78  2006/03/25 14:07:53  glen
 - avoid installing unneeded find-lang and caldera-init files
 - cleanup patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/webmin.spec?r1=1.78&r2=1.79&f=u