Provide all old package names that are now obsolete. Following
the packaging guideline at: http://fedoraproject.org/wiki/PackageNamingGuidelines#Renaming.2Freplacing_existing_packages
This commit is contained in:
Jan-Frode Myklebust
parent
cf7db91a88
commit
aebe2468a4
35
clamav.spec
35
clamav.spec
|
|
@ -5,7 +5,7 @@
|
|||
Summary: Anti-virus software
|
||||
Name: clamav
|
||||
Version: 0.97
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/System
|
||||
URL: http://www.clamav.net/
|
||||
|
|
@ -24,10 +24,12 @@ Requires: clamav-db = %{version}-%{release}
|
|||
Requires(pre): shadow-utils
|
||||
|
||||
### Fedora Extras introduced them differently :(
|
||||
Obsoletes: libclamav < %{version}-%{release}
|
||||
Obsoletes: clamav-lib < %{version}-%{release}
|
||||
Obsoletes: clamav-filesystem < %{version}-%{release}
|
||||
Provides: libclamav
|
||||
Obsoletes: libclamav < %{version}-%{release}
|
||||
Provides: clamav-lib = %{version}-%{release}
|
||||
Obsoletes: clamav-lib < %{version}-%{release}
|
||||
Provides: clamav-filesystem = %{version}-%{release}
|
||||
Obsoletes: clamav-filesystem < %{version}-%{release}
|
||||
|
||||
%description
|
||||
Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of
|
||||
|
|
@ -45,8 +47,17 @@ Group: System Environment/Daemons
|
|||
Requires: clamav = %{version}-%{release}
|
||||
|
||||
### Fedora Extras introduced them differently :(
|
||||
Obsoletes: clamav-server <= %{version}-%{release}
|
||||
Obsoletes: clamav-server-sysv <= %{version}-%{release}
|
||||
Provides: clamav-server = %{version}-%{release}
|
||||
Obsoletes: clamav-server < %{version}-%{release}
|
||||
Provides: clamav-server-sysv = %{version}-%{release}
|
||||
Obsoletes: clamav-server-sysv < %{version}-%{release}
|
||||
Provides: clamav-scanner = %{version}-%{release}
|
||||
Obsoletes: clamav-scanner < %{version}-%{release}
|
||||
Provides: clamav-scanner-upstart = %{version}-%{release}
|
||||
Obsoletes: clamav-scanner-upstart < %{version}-%{release}
|
||||
Provides: clamav-server-sysvinit = %{version}-%{release}
|
||||
Obsoletes: clamav-server-sysvinit < %{version}-%{release}
|
||||
|
||||
|
||||
%description -n clamd
|
||||
The Clam AntiVirus Daemon
|
||||
|
|
@ -56,7 +67,8 @@ Summary: The Clam AntiVirus sendmail-milter Daemon
|
|||
Group: Applications/System
|
||||
Requires: clamd = %{version}-%{release}
|
||||
Requires: sendmail
|
||||
Obsoletes: clamav-milter-sysv <= %{version}-%{release}
|
||||
Provides: clamav-milter-sysv = %{version}-%{release}
|
||||
Obsoletes: clamav-milter-sysv < %{version}-%{release}
|
||||
|
||||
%description milter
|
||||
The Clam AntiVirus sendmail-milter Daemon
|
||||
|
|
@ -68,8 +80,10 @@ Group: Applications/Databases
|
|||
#Requires: clamav = %{version}-%{release}
|
||||
|
||||
### Fedora Extras introduced them differently :(
|
||||
Obsoletes: clamav-update <= %{version}-%{release}
|
||||
Obsoletes: clamav-data <= %{version}-%{release}
|
||||
Provides: clamav-update = %{version}-%{release}
|
||||
Obsoletes: clamav-update < %{version}-%{release}
|
||||
Provides: clamav-data = %{version}-%{release}
|
||||
Obsoletes: clamav-data < %{version}-%{release}
|
||||
Obsoletes: clamav-data-empty <= %{version}-%{release}
|
||||
|
||||
%description db
|
||||
|
|
@ -385,6 +399,9 @@ rm -rf %{buildroot}
|
|||
%exclude %{_libdir}/libclamav.la
|
||||
|
||||
%changelog
|
||||
* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode@tanso.net> - 0.97-7
|
||||
- rpm-provide all old package names that are now obsoleted
|
||||
|
||||
* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode@tanso.net> - 0.97-6
|
||||
- clam-db obsoletes old clamav-data-empty.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Xchkconfig: - 75 25
|
||||
# Xdescription: The clamd daemon listens for incoming connections on \
|
||||
# Unix or TCP socket and scans files or directories on demand.
|
||||
|
||||
test "$CLAMD_SERVICE" || {
|
||||
echo $"*** $0 can not be called in this way"
|
||||
echo $"*** Please see /usr/share/doc/clamav-server-*/README how"
|
||||
echo $"*** the clamav-server can be configured"
|
||||
exit 6
|
||||
}
|
||||
|
||||
# Source function library.
|
||||
. /etc/init.d/functions
|
||||
|
||||
# Get config.
|
||||
test -r /etc/sysconfig/network && . /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
test "$NETWORKING" != "no" || exit 6
|
||||
|
||||
lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE}
|
||||
sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE}
|
||||
procname=clamd.${CLAMD_SERVICE}
|
||||
|
||||
CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf
|
||||
CLAMD_OPTIONS=
|
||||
## backward-compatibility check...
|
||||
for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \
|
||||
/var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
|
||||
CLAMD_SOCKET=$i
|
||||
test ! -e "$i" || break
|
||||
done
|
||||
test -f "$sysconffile" && . "$sysconffile"
|
||||
|
||||
|
||||
RETVAL=0
|
||||
prog="clamd.${CLAMD_SERVICE}"
|
||||
|
||||
start () {
|
||||
echo -n $"Starting $prog: "
|
||||
daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS}
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch $lockfile
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
stop () {
|
||||
echo -n $"Stopping $prog: "
|
||||
killproc $procname
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f $lockfile
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
reload() {
|
||||
rc=0
|
||||
echo -n $"Reloading $prog: "
|
||||
killproc $procname -SIGHUP || rc=$?
|
||||
echo
|
||||
echo -n $"Loading new virus-database: "
|
||||
killproc $procname -SIGUSR2 || rc=$?
|
||||
echo
|
||||
return $rc
|
||||
}
|
||||
|
||||
restart () {
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start|stop|restart|reload)
|
||||
$1 ;;
|
||||
status)
|
||||
status $procname ;;
|
||||
condrestart)
|
||||
test ! -f $lockfile || restart
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
|
||||
exit 2
|
||||
esac
|
||||
Loading…
Reference in New Issue