SPECS: webmin.spec - pl fixes, strict internal deps, killed PreReq

qboosh qboosh at pld-linux.org
Sun Feb 5 11:14:20 CET 2006


Author: qboosh                       Date: Sun Feb  5 10:14:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pl fixes, strict internal deps, killed PreReq

---- Files affected:
SPECS:
   webmin.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/webmin.spec
diff -u SPECS/webmin.spec:1.63 SPECS/webmin.spec:1.64
--- SPECS/webmin.spec:1.63	Sun Feb  5 00:42:26 2006
+++ SPECS/webmin.spec	Sun Feb  5 11:14:15 2006
@@ -10,7 +10,6 @@
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/webadmin/%{name}-%{version}.tar.gz
 # Source0-md5:	c45fe387902405cb36a1a5c6a240ad0d
-#
 # Unofficial webmin tarballs location (if anybody interested):
 #Source0:	http://fudu.webmin.com/webmin/tarballs/%{name}-%{source_version}.tar.gz
 Source1:	%{name}.init
@@ -51,8 +50,8 @@
 Summary:	Webmin - Partition and disk management tools
 Summary(pl):	Webmin - Narzędzia do zarządzania dyskami i partycjami
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name}-system = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name}-system = %{version}-%{release}
 Requires:	fdisk
 Requires:	hdparm
 
@@ -60,28 +59,30 @@
 Webmin - Partition and disk management tools.
 
 %description disk-tools -l pl
-Webmin - Narzędzia do zarządzania dyskami i partycjami.
+Webmin - narzędzia do zarządzania dyskami i partycjami.
 
 # APACHE
 %package apache
 Summary:	Webmin - Apache webserver
 Summary(pl):	Webmin - Serwer WWW Apache
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	webserver = apache
 
 %description apache
-Webmin - Configure almost all Apache directives and features..
+Webmin - Configure almost all Apache directives and features.
 
 %description apache -l pl
-Webmin - Konfigurowanie prawie wszystkich ustawień Apache.
+Webmin - konfigurowanie prawie wszystkich ustawień Apache.
 
 # AT
 %package at
 Summary:	Webmin - At
 Summary(pl):	Webmin - At
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	at
 
 %description at
@@ -93,41 +94,43 @@
 # ppp-client
 %package ppp-client
 Summary:	Webmin - Configure modem connection
-Summary(pl):	Webmin - Konfiguracja połączenia przez modem
+Summary(pl):	Webmin - konfiguracja połączenia przez modem
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	ppp
 
 %description ppp-client
 Webmin - Configure the WV-Dial package to connect to the Internet with
-a modem PPP connection
+a modem PPP connection.
 
 %description ppp-client -l pl
-Webmin - Konfiguracja WV-Dial do połączenia z Internetem poprzez
-modem.
+Webmin - konfiguracja pakietu WV-Dial do łączenia z Internetem po PPP
+przez modem.
 
 # pptp-client
 %package  pptp-client
 Summary:	Webmin - pptp-client
-Summary(pl):	Webmin - pptp-client
+Summary(pl):	Webmin - klient PPTP
 Group:		Applications/System
-#Requires:	
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description pptp-client
 Webmin - Configure and establish connections to a VPN server using the
 PPTP protocol.
 
 %description pptp-client -l pl
-Webmin - Konfiguracja i zestawienie połączenia do serwera VPN poprzez
+Webmin - konfiguracja i zestawianie połączenia do serwera VPN poprzez
 protokół PPTP.
 
 # pptp-server
 %package pptp-server
 Summary:	Webmin - pptp-server
-Summary(pl):	Webmin - pptp-server
+Summary(pl):	Webmin - serwer PPTP
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	pptpd
 
 %description pptp-server
@@ -135,28 +138,31 @@
 VPN clients can connect.
 
 %description pptp-server -l pl
-Webmin - Ustawienie systemu jako serwera PPTP.
+Webmin - ustawienie systemu jako serwera PPTP, z którym mogą się
+łączyć linuksowi i windowsowi klienci VPN.
 
 # ipsec
 %package ipsec
 Summary:	Webmin - IPsec VPN Configuration
-Summary(pl):	Webmin - Konfiguratot IPsec VPN
+Summary(pl):	Webmin - konfigurator IPsec VPN
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	ipsec-tools
 
 %description ipsec
 Webmin - Set up a client or server for an IPsec VPN using FreeSWAN.
 
 %description ipsec -l pl
-Webmin - Ustawienie klienta lub serwera IPsec VPN używając FreeSWAN.
+Webmin - ustawianie klienta lub serwera IPsec VPN używając FreeSWAN.
 
 # firewall
 %package firewall
 Summary:	Webmin - Linux firewall
-Summary(pl):	Webmin - Zapora ogniowa dla Linuxa
+Summary(pl):	Webmin - zapora ogniowa dla Linuksa
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	iptables
 
 %description firewall
@@ -164,61 +170,62 @@
 of all tables, chains, rules and options.
 
 %description firewall -l pl
-Webmin - Konfiguracja zapory dla linuxa z iptables. Pozwala na
-edytowanie tablic, łańcuchów i reguł filtrowania.
+Webmin - konfiguracja zapory dla Linuksa z iptables. Pozwala na
+modyfikowanie tablic, łańcuchów i reguł filtrowania.
 
 # idmapd
 %package idmapd
 Summary:	Webmin - Managing the NFS ID mapping daemon
-Summary(pl):	Webmin - Administracja demonem NFS ID
+Summary(pl):	Webmin - administracja demonem NFS ID
 Group:		Applications/System
-#Requires:	
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description idmapd
 Webmin - Managing the NFS ID mapping daemon.
 
 %description idmapd -l pl
-Webmin - Administracja demonem NFS ID.
+Webmin - administracja demonem NFS ID.
 
 # BIND 8/9
 %package bind8
 Summary:	Webmin - BIND DNS server
-Summary(pl):	Webmin - Serwer DNS BIND
+Summary(pl):	Webmin - serwer DNS BIND
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	bind
 
 %description bind8
 Webmin - Create and edit domains, DNS records, BIND options and
-views..
+views.
 
 %description bind8 -l pl
-Webmin - Tworzenie i edytowanie domen, wpisów DNS.
+Webmin - tworzenie i modyfikowanie domen, rekordów DNS, opcji BIND-a i
+widoków.
 
 # DNSADMIN
 %package dnsadmin
-Summary:	Webmin - BIND 4 DNSadmin
-Summary(pl):	Webmin - Administracja serverem DNS BIND
+Summary:	Webmin - BIND 4 DNS admin
+Summary(pl):	Webmin - administracja serverem DNS BIND
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 #Requires:	bind
 
 %description dnsadmin
 Webmin - Create and edit domains and DNS records.
 
 %description dnsadmin -l pl
-Webmin - Tworzenie i edytowanie domen, wpisów DNS.
+Webmin - Tworzenie i modyfikowanie domen, wpisów DNS.
 
 # BURNER
 %package burner
 Summary:	Webmin - CD Burner
 Summary(pl):	Webmin - Wypalanie płyt CD
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	cdrecord
 Requires:	mkisofs
 Requires:	mpg123
@@ -237,8 +244,8 @@
 Summary:	Webmin - Status of IDE hard drives
 Summary(pl):	Webmin - Status Twardych Dysków
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	smartmontools
 
 %description smart-status
@@ -255,8 +262,8 @@
 Summary:	Webmin - Configuration Engine
 Summary(pl):	Webmin - cfengine
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	cfengine
 
 %description cfengine
@@ -273,8 +280,8 @@
 Summary:	Webmin - Cluster software packages
 Summary(pl):	Webmin - Pakiety oprogramowania
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description cluster-software
 Webmin - Install RPMs, debian and solaris packages across multiple
@@ -289,8 +296,8 @@
 Summary:	Webmin - Cluster shell
 Summary(pl):	Webmin - Cluster shell
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description cluster-shell
 Webmin - Run commands on multiple servers at once.
@@ -303,8 +310,8 @@
 Summary:	Webmin - Cluster users and groups
 Summary(pl):	Webmin - Użytkownicy i grupy klastra
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description cluster-useradmin
 Webmin - Create, update and delete users and groups across multiple
@@ -321,8 +328,8 @@
 Summary:	Webmin - Cluster usermin
 Summary(pl):	Webmin - Cluster usermin
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description cluster-usermin
 Webmin - Install and manage modules and themes across multiple Usermin
@@ -337,8 +344,8 @@
 Summary:	Webmin - Cluster copy file
 Summary(pl):	Webmin - Cluster copy file
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	cron
 
 %description cluster-copy
@@ -354,8 +361,8 @@
 Summary:	Webmin - Cluster cron
 Summary(pl):	Webmin - Cluster cron
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	cron
 
 %description cluster-cron
@@ -371,8 +378,8 @@
 Summary:	Webmin - Cluster passwd
 Summary(pl):	Webmin - Cluster passwd
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	passwd
 Requires:	webmin-claster-useradmin
 Requires:	useradmin
@@ -389,8 +396,8 @@
 Summary:	Webmin - Manage users and groups stored in an LDAP database
 Summary(pl):	Webmin - Administracja Użytkownikami i grupami w bazie LDAP
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description ldap-useradmin
 Webmin - Manage users and groups stored in an LDAP database, used for
@@ -405,8 +412,8 @@
 Summary:	Webmin - Cluster Webmin servers
 Summary(pl):	Webmin - Klaster serwerów Webmina
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name}-servers = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name}-servers = %{version}-%{release}
 
 %description cluster-webmin
 Webmin - Install and manage modules, themes, users, groups and access
@@ -421,22 +428,22 @@
 Summary:	Webmin - Cron
 Summary(pl):	Webmin - Cron
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
 
 %description cron
 Webmin - Create, edit and delete Cron jobs.
 
 %description cron -l pl
-Webmin - Tworzenie, edytowanie i usuwanie wpisów w cron.
+Webmin - tworzenie, modyfikowanie i usuwanie zadań crona.
 
 %package vgetty
 Summary:	Webmin - Vgetty
 Summary(pl):	Webmin - Vgetty
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description vgetty
 Webmin - Set up your system as an answering machine using vgetty.
@@ -449,8 +456,8 @@
 Summary:	Webmin - DHCP server
 Summary(pl):	Webmin - Serwer DHCP
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	dhcp
 
 %description dhcpd
@@ -466,8 +473,8 @@
 Summary:	Webmin - adsl-client
 Summary(pl):	Webmin - adsl-client
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description adsl-client
 Webmin - Set up a PPP client with the RP-PPPoE package..
@@ -480,8 +487,8 @@
 Summary:	Webmin - Fetchmail
 Summary(pl):	Webmin - Fetchmail
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	fetchmail
 
 %description fetchmail
@@ -497,8 +504,8 @@
 Summary:	Webmin - dovecot
 Summary(pl):	Webmin - dovecot
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	dovecot
 
 %description dovecot
@@ -512,8 +519,8 @@
 Summary:	Webmin - mailboxes
 Summary(pl):	Webmin - mailboxes
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description mailboxes
 Webmin - Read email in users' mailboxes.
@@ -527,8 +534,8 @@
 Summary:	Webmin - Webalizer Configuration
 Summary(pl):	Webmin - Konfiguracja Webalizera
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	webalizer
 
 %description webalizer
@@ -543,8 +550,8 @@
 Summary:	Webmin - Upload and Download 
 Summary(pl):	Webmin - Upload and Download 
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description updown
 Webmin - Upload multiple files to the server, and download multiple
@@ -559,9 +566,8 @@
 Summary:	Webmin - Filesystem backup
 Summary(pl):	Webmin - Archiwizacja systemu plików
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Prereq:		rc-scripts
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	dump
 Requires:	rc-scripts
 
@@ -576,8 +582,8 @@
 Summary:	Webmin - Filesystem backup
 Summary(pl):	Webmin - Archiwizacja systemu plików
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description backup-config
 Webmin - Perform manual or scheduled backups and restores of
@@ -592,8 +598,8 @@
 Summary:	Webmin - GRUB configuration
 Summary(pl):	Webmin - Konfiguracja GRUB-a
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	grub
 
 %description grub
@@ -608,8 +614,8 @@
 Summary:	Webmin - Heartbeat Monitor
 Summary(pl):	Webmin - Monitor Heartbeat
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	heartbeat
 
 %description heartbeat
@@ -624,8 +630,8 @@
 Summary:	Webmin - Inetd
 Summary(pl):	Webmin - Inetd
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	inetd
 
 %description inetd
@@ -639,8 +645,8 @@
 Summary:	Jabber IM server
 Summary(pl):	Konfiguracja serwera Jabber
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	jabberd
 
 %description jabber
@@ -654,8 +660,8 @@
 Summary:	Kerberos client settings
 Summary(pl):	Konfiguracja klienta Kerbos
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	krb5
 
 %description krb5
@@ -669,8 +675,8 @@
 Summary:	Webmin - LILO configuration
 Summary(pl):	Webmin - Konfiguracja LILO
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	lilo
 
 %description lilo
@@ -684,8 +690,8 @@
 Summary:	Webmin - Logical Volume Management
 Summary(pl):	Webmin - Zarządzanie wolumenami logicznymi (LVM)
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	lvm2
 
 %description lvm
@@ -700,8 +706,8 @@
 Summary:	Webmin - Majordomo List Manager
 Summary(pl):	Webmin - Zarządca list dyskusyjnych Majordomo
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name}-sendmail = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name}-sendmail = %{version}-%{release}
 #Requires:	majordomo
 
 %description majordomo
@@ -715,9 +721,8 @@
 Summary:	Webmin - MON resource monitoring system
 Summary(pl):	Webmin - System monitorowania zasobów MON
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Prereq:		rc-scripts
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	mon
 Requires:	rc-scripts
 
@@ -733,8 +738,8 @@
 Summary:	Webmin - MySQL server
 Summary(pl):	Webmin - Serwer MySQL
 Group:		Applications/System
-Prereq:		%{name} = %{version}
-Requires:	%{name} = %{version}
+Requires(post):	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	mysql
 
 %description mysql
@@ -749,9 +754,8 @@
 Summary:	Webmin - Network configuration
 Summary(pl):	Webmin - Konfiguracja sieci
<<Diff was trimmed, longer than 597 lines>>

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



More information about the pld-cvs-commit mailing list