Author: pascalek Date: Fri Oct 20 05:58:36 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.3.3.1 svn, AC bcond
---- Files affected: SPECS: dosemu.spec (1.119 -> 1.120) ---- Diffs: ================================================================ Index: SPECS/dosemu.spec diff -u SPECS/dosemu.spec:1.119 SPECS/dosemu.spec:1.120 --- SPECS/dosemu.spec:1.119 Tue Jan 10 19:27:35 2006 +++ SPECS/dosemu.spec Fri Oct 20 07:58:31 2006 @@ -3,6 +3,7 @@ # # Conditional build: %bcond_with static # link statically +%bcond_with AC %bcond_without x # X support # Summary: A DOS emulator @@ -13,11 +14,11 @@ Summary(pt_BR): Emulador DOS Summary(tr): DOS öykünümcüsü Name: dosemu -Version: 1.3.3 -Release: 1 +Version: 1.3.3.1 +Release: 0.svn.1 License: GPL v2 Group: Applications/Emulators -Source0: http://dl.sourceforge.net/dosemu/%{name}-%{version}.tgz +Source0: http://dl.sourceforge.net/dosemu/%{name}-1.3.3.tgz # Source0-md5: f3b27a9326e5c95e59093fcb79a61023 #Source2: %{name}-sys.tar.gz Source3: %{name}-PRZECZYTAJ_TO @@ -30,11 +31,18 @@ Patch2: %{name}-%{name}_conf.patch Patch3: %{name}-doSgmlTools.patch Patch4: %{name}-makehtml.patch +Patch5: %{name}-1.3.3.1svn.patch.gz URL: http://www.dosemu.org/ BuildRequires: SDL-devel %if %{with x} -BuildRequires: XFree86-devel -%{?with_static:BuildRequires: XFree86-static} +%if %{without AC} +BuildRequires: xorg-lib-libX11-devel +%{?with_static:BuildRequires: xorg-lib-libX11-static} +%endif +%if %{with AC} +BuildRequires: X11-devel +%{?with_static:BuildRequires: X11-static} +%endif %endif BuildRequires: autoconf >= 2.57 BuildRequires: bin86 @@ -121,13 +129,14 @@ Wtyczka X dla dosemu. %prep -%setup -q -a6 +%setup -q -a6 -n %{name}-1.3.3 #sh tmp/do_patch -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build OPTFLAGS="%{rpmcflags}"; export OPTFLAGS @@ -188,7 +197,7 @@ install bin/libplugin*.so $RPM_BUILD_ROOT%{_libdir}/dosemu install bin/dosdebug $RPM_BUILD_ROOT%{_bindir}/dosdebug -install src/tools/periph/{dexeconfig,hdinfo,mkhdimage,mkfatimage16} $RPM_BUILD_ROOT%{_bindir} +install src/tools/periph/{dexeconfig,hdinfo,mkhdimage} $RPM_BUILD_ROOT%{_bindir} ln -sf dos $RPM_BUILD_ROOT%{_bindir}/dosexec install etc/dosemu.xpm $RPM_BUILD_ROOT%{_pixmapsdir} @@ -247,7 +256,7 @@ %attr(755,root,root) %{_bindir}/dexeconfig %attr(755,root,root) %{_bindir}/hdinfo %attr(755,root,root) %{_bindir}/mkhdimage -%attr(755,root,root) %{_bindir}/mkfatimage16 +#%attr(755,root,root) %{_bindir}/mkfatimage16 %{_mandir}/man1/mkfatimage16.1* %lang(ru) %{_mandir}/ru/man1/mkfatimage16.1* @@ -267,6 +276,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.120 2006/10/20 05:58:31 pascalek +- updated to 1.3.3.1 svn, AC bcond + Revision 1.119 2006/01/10 18:27:35 qboosh - added /dev/shm note (coflicts with noexec shm) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dosemu.spec?r1=1.119&r2=1.120&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
