Author: glen Date: Thu Apr 20 16:38:55 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - join requires - fix broken postun - adapter
---- Files affected: SPECS: mkcdrec.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: SPECS/mkcdrec.spec diff -u SPECS/mkcdrec.spec:1.4 SPECS/mkcdrec.spec:1.5 --- SPECS/mkcdrec.spec:1.4 Fri Dec 2 19:49:52 2005 +++ SPECS/mkcdrec.spec Thu Apr 20 18:38:50 2006 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO +# - kill race in %post %define _boot_arch x86 %define _utils_version 0.7.9 Summary: mkCDrec (make CD-ROM Recovery) disaster recovery tool-set @@ -7,7 +9,7 @@ Version: 0.8.9 Release: 0.1 License: GPL -Group: System/Tools +Group: Applications Source0: http://mkcdrec.ota.be/project/mkCDrec_v%{version}.tar.gz # Source0-md5: 0cbe2efbd083ce9745c5d5c5cea1c7c2 Source1: http://mkcdrec.ota.be/project/mkCDrec_v%{_utils_version}_utils.tar.gz @@ -15,49 +17,32 @@ ##Source10: busybox-1.01.tar.bz2 Patch0: %{name}-usebashizms.patch URL: http://mkcdrec.ota.be/ +BuildRequires: gcc >= 5:2.96 Requires: MAKEDEV Provides: perl(mkcdrec-lib.pl) -%if %{_boot_arch}==ia64 -BuildRequires: gcc >= 5:2.96 -Requires: ash -Requires: /sbin/chkconfig -Requires: cdrtools -Requires: cdrtools-mkisofs +%if %{_boot_arch} == ia64 Requires: fileutils Requires: mtools Requires: parted >= 1.6 -Requires: perl-base >= 1:5.0 -Requires: rsync -Requires: tar -Requires: util-linux >= 2.11 %endif -%if %{_boot_arch}==x86_64 -BuildRequires: gcc >= 5:2.96 -Requires: ash -Requires: cdrtools -Requires: cdrtools-mkisofs +%if %{_boot_arch} == x86_64 Requires: fileutils -Requires: perl-base >= 1:5.0 -Requires: rsync Requires: syslinux -Requires: tar -Requires: util-linux >= 2.11 %endif -%if %{_boot_arch}==x86 -BuildRequires: gcc >= 5:2.96 +%if %{_boot_arch} == x86 BuildRequires: syslinux >= 1.60 -Requires: ash Requires: coreutils +Requires: syslinux +%endif +Requires(post): coreutils +Requires(post): ed +Requires: ash Requires: cdrtools Requires: cdrtools-mkisofs Requires: perl-base >= 1:5.0 Requires: rsync -Requires: syslinux Requires: tar Requires: util-linux >= 2.11 -%endif -Requires(post): coreutils -Requires(post): ed BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _prefix /var/opt/mkcdrec @@ -92,8 +77,8 @@ również wpierana. %prep -%setup -q -n mkcdrec -a 1 -%patch0 -p0 +%setup -q -n %{name} -a 1 +%patch0 -p0 find . -name CVS | xargs rm -Rf @@ -118,7 +103,7 @@ install -m 755 $fname $RPM_BUILD_ROOT%{_prefix}/busybox done -install -m 755 busybox*/applets/install.sh $RPM_BUILD_ROOT%{_prefix}/busybox/applets +install busybox*/applets/install.sh $RPM_BUILD_ROOT%{_prefix}/busybox/applets for fname in cutstream*/cutstream \ pastestream*/pastestream mediacheck/checkisomd5 mediacheck/implantisomd5 @@ -164,7 +149,7 @@ install -m 755 $fname $RPM_BUILD_ROOT%{_prefix}/$fname done -install -m 644 doc/mkcdrec.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install doc/mkcdrec.8 $RPM_BUILD_ROOT%{_mandir}/man8 for file in \ $RPM_BUILD_ROOT%{_prefix}/.cvsignore \ @@ -209,6 +194,7 @@ install -m 750 %{_prefix}/contributions/mkcdrec /usr/sbin/mkcdrec %postun +if [ "$1" = 0 ]; then # we remove mkcdrec from webmin root's ACL if [ -f %{_webmin_access_file} ]; then @@ -221,6 +207,7 @@ fi # rm the mkcdrec wrapper rm -f /usr/sbin/mkcdrec +fi %files %defattr(644,root,root,755) @@ -268,6 +255,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2006/04/20 16:38:50 glen +- join requires +- fix broken postun +- adapter + Revision 1.4 2005/12/02 18:49:52 hunter - include some utils in mkcdrec - attempt to use bash where it's nesessery ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mkcdrec.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit