Author: qboosh Date: Sat Feb 9 16:46:00 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 5.5 with 20060227 patch - updated diskd-conflict patch, removed outdated manpages,ac25x patches - added DESTDIR patch, use make install - setfdprm is back here (removed from util-linux since 0.13-pre7)
---- Files affected: SPECS: fdutils.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/fdutils.spec diff -u SPECS/fdutils.spec:1.29 SPECS/fdutils.spec:1.30 --- SPECS/fdutils.spec:1.29 Sat Feb 9 15:01:39 2008 +++ SPECS/fdutils.spec Sat Feb 9 17:45:55 2008 @@ -3,22 +3,25 @@ Summary(pl.UTF-8): Narzędzia do dyskietek Summary(zh_CN.UTF-8): 软盘驱动调试和配置工具 Name: fdutils -Version: 5.4 -Release: 10 +Version: 5.5 +Release: 1 License: GPL v2 Group: Applications/System +#Source0Download: http://fdutils.linux.lu/download.html Source0: http://fdutils.linux.lu/%{name}-%{version}.tar.gz -# Source0-md5: 17c1df04b1e524078ee52825a5ef5e56 -Patch0: %{name}-manpages.patch -Patch1: %{name}-info.patch -Patch2: %{name}-ac25x.patch -Patch3: %{name}-diskd-conflict.patch -Patch4: %{name}-nodvi.patch +# Source0-md5: 2b8b65f52378158a4a21e455566b456d +Patch0: %{name}-info.patch +Patch1: %{name}-DESTDIR.patch +Patch2: %{name}-diskd-conflict.patch +Patch3: %{name}-nodvi.patch +Patch4: http://fdutils.linux.lu/fdutils-5.5-20060227.diff.gz URL: http://fdutils.linux.lu/ BuildRequires: autoconf BuildRequires: automake BuildRequires: flex BuildRequires: texinfo +# setfdprm used to be in util-linux before +Conflicts: util-linux < 2.13-0.pre7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -45,12 +48,10 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -mv -f doc/{,fd}diskd.texi -mv -f doc/{,fd}diskd.1 %patch4 -p1 %build -install /usr/share/automake/config.* . +cp -f /usr/share/automake/config.* . %{__aclocal} %{__autoconf} %configure @@ -58,42 +59,58 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1,%{_infodir}} +install -d $RPM_BUILD_ROOT%{_sysconfdir} -install src/MAKEFLOPPIES $RPM_BUILD_ROOT%{_bindir} -install src/convertfdprm $RPM_BUILD_ROOT%{_bindir} -install src/fddiskd $RPM_BUILD_ROOT%{_bindir} -install src/diskseekd $RPM_BUILD_ROOT%{_bindir} -install src/fdmount $RPM_BUILD_ROOT%{_bindir} -install src/fdrawcmd $RPM_BUILD_ROOT%{_bindir} -install src/floppycontrol $RPM_BUILD_ROOT%{_bindir} -install src/floppymeter $RPM_BUILD_ROOT%{_bindir} -install src/getfdprm $RPM_BUILD_ROOT%{_bindir} -install src/superformat $RPM_BUILD_ROOT%{_bindir} -install src/xdfcopy $RPM_BUILD_ROOT%{_bindir} - -install src/mediaprm $RPM_BUILD_ROOT%{_sysconfdir} - -install doc/fdutils.info* $RPM_BUILD_ROOT%{_infodir} -install doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/setfdprm.1 +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +# in man-pages +rm $RPM_BUILD_ROOT%{_mandir}/man4/fd.4 %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files %defattr(644,root,root,755) %doc doc/README doc/floppy_formats Changelog CREDITS doc/FAQ.html %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediaprm -%attr(755,root,root) %{_bindir}/* -%{_mandir}/man1/* -%{_infodir}/*.info* +%attr(755,root,root) %{_bindir}/MAKEFLOPPIES +%attr(755,root,root) %{_bindir}/diskseekd +%attr(755,root,root) %{_bindir}/fddiskd +%attr(755,root,root) %{_bindir}/fdlist +%attr(755,root,root) %{_bindir}/fdmount +%attr(755,root,root) %{_bindir}/fdmountd +%attr(755,root,root) %{_bindir}/fdrawcmd +%attr(755,root,root) %{_bindir}/fdumount +%attr(755,root,root) %{_bindir}/floppycontrol +%attr(755,root,root) %{_bindir}/floppymeter +%attr(755,root,root) %{_bindir}/getfdprm +%attr(755,root,root) %{_bindir}/setfdprm +%attr(755,root,root) %{_bindir}/superformat +%attr(755,root,root) %{_bindir}/xdfcopy +%attr(755,root,root) %{_bindir}/xdfformat +%{_mandir}/man1/makefloppies.1* +%{_mandir}/man1/diskseekd.1* +%{_mandir}/man1/fddiskd.1* +%{_mandir}/man1/fdlist.1* +%{_mandir}/man1/fdmount.1* +%{_mandir}/man1/fdmountd.1* +%{_mandir}/man1/fdrawcmd.1* +%{_mandir}/man1/fdumount.1* +%{_mandir}/man1/floppycontrol.1* +%{_mandir}/man1/floppymeter.1* +%{_mandir}/man1/getfdprm.1* +%{_mandir}/man1/setfdprm.1* +%{_mandir}/man1/superformat.1* +%{_mandir}/man1/xdfcopy.1* +%{_mandir}/man1/xdfformat.1* +%{_infodir}/fdutils.info* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -101,6 +118,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2008-02-09 16:45:55 qboosh +- updated to 5.5 with 20060227 patch +- updated diskd-conflict patch, removed outdated manpages,ac25x patches +- added DESTDIR patch, use make install +- setfdprm is back here (removed from util-linux since 0.13-pre7) + Revision 1.29 2008-02-09 14:01:39 qboosh - FDC vs USB note ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fdutils.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
