diff --git a/bind/bind.spec b/bind/bind.spec index b28d920be0..c11eac7972 100644 --- a/bind/bind.spec +++ b/bind/bind.spec @@ -60,32 +60,6 @@ AutoReqProv: no of the Domain Name System, including a Domain Name System server (named) -%package sys -Summary: Berkeley Internet Name Domain (BIND) Daemon -Group: DNS -Conflicts: bind < 8.2.4-4 -AutoReq: no -AutoReqProv: no -%description sys - Berkeley Internet Name Domain (BIND) is an implementation of - the Domain Name System (DNS) protocols and provides an openly - redistributable reference implementation of the major components - of the Domain Name System, including a Domain Name System server - (named) - -%package usr -Summary: Berkeley Internet Name Domain (BIND) Client Utilities -Group: DNS -Conflicts: bind < 8.2.4-4 -AutoReq: no -AutoReqProv: no -%description usr - Berkeley Internet Name Domain (BIND) is an implementation of - the Domain Name System (DNS) protocols and provides an openly - redistributable reference implementation of the major components - of the Domain Name System, including a suite of client utilities - for verifying the proper operation of the DNS server. - %prep %setup0 -q -c -n bind-%{version} %setup1 -q -T -D -a 1 @@ -181,11 +155,8 @@ AutoReqProv: no %{l_files_std} \ '%config %{l_prefix}/etc/bind/named.conf' \ '%config %{l_prefix}/etc/bind/named.db/*' - egrep -v "/(bin|man1)/" files >files-sys - egrep -v "/(etc|libexec|sbin|man8|var)/" files >files-usr -%files sys -f files-sys -%files usr -f files-usr +%files -f files %clean rm -rf $RPM_BUILD_ROOT diff --git a/rsync/rsync.spec b/rsync/rsync.spec index 35c4680809..778b9d35e3 100644 --- a/rsync/rsync.spec +++ b/rsync/rsync.spec @@ -58,36 +58,6 @@ AutoReqProv: no impossible because the calculation of diffs between two files normally requires local access to both files. -%package sys -Summary: Remote Filesystem Synchronization Daemon -Group: Filesystem -#PreReq: OpenPKG, openpkg >= 0.9-20011025.0 rsync-usr -AutoReq: no -AutoReqProv: no -%description sys - Rsync is a replacement for rcp that has many more features. rsync uses the - "rsync algorithm" which provides a very fast method for bringing remote - files into sync. It does this by sending just the differences in the files - across the link, without requiring that both sets of files are present at - one of the ends of the link beforehand. At first glance this may seem - impossible because the calculation of diffs between two files normally - requires local access to both files. - -%package usr -Summary: Remote Filesystem Synchronization Client -Group: Filesystem -Conflicts: rsync < 2.4.6-5 -AutoReq: no -AutoReqProv: no -%description usr - Rsync is a replacement for rcp that has many more features. rsync uses the - "rsync algorithm" which provides a very fast method for bringing remote - files into sync. It does this by sending just the differences in the files - across the link, without requiring that both sets of files are present at - one of the ends of the link beforehand. At first glance this may seem - impossible because the calculation of diffs between two files normally - requires local access to both files. - %prep %setup -q %patch -p0 @@ -127,12 +97,9 @@ AutoReqProv: no %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ '%config %{l_prefix}/etc/rsync/rsyncd.*' - egrep -v "/(bin|man1)/" files > files-sys - egrep -v "/(etc|man5|var)/" files > files-usr -%files sys -f files-sys -%files usr -f files-usr +%files -f files %clean - rm -rf $RPM_BUILD_ROOT + rm -rf $RPM_BUILD_ROOT