rpms/mess/devel .cvsignore, 1.5, 1.6 mess.spec, 1.4, 1.5 sources, 1.5, 1.6

Author: belegdol Update of /cvs/nonfree/rpms/mess/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20961 Modified Files: .cvsignore mess.spec sources Log Message: * Mon Apr 04 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.142-1 - Updated to 0.142 - Provided an easy way to build a SVN snapshot - Filtered out redundant $RPM_OPT_FLAGS - No longer enable joystick by default - Re-enabled the fortify patch - Delete mame hash files Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mess/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Jan 2011 20:08:26 -0000 1.5 +++ .cvsignore 4 Apr 2011 19:45:28 -0000 1.6 @@ -1,3 +1,3 @@ ctrlr.rar -mame0141s.exe -mess0141s.zip +mame0142s.exe +mess0142s.zip Index: mess.spec =================================================================== RCS file: /cvs/nonfree/rpms/mess/devel/mess.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mess.spec 14 Jan 2011 20:08:26 -0000 1.4 +++ mess.spec 4 Apr 2011 19:45:28 -0000 1.5 @@ -1,7 +1,8 @@ # the debug build is disabled by default, please use --with debug to override %bcond_with debug -%global baseversion 141 +%global baseversion 142 +#global snapshot 1 Name: mess Version: 0.%{baseversion} @@ -12,11 +13,13 @@ #Files in src/lib/util and src/osd (except src/osd/sdl) are BSD License: MAME License URL: http://www.mess.org/ +%if 0%{?snapshot} +Source0: mess-snapshot.tar.xz +%else Source0: http://www.aarongiles.com/mirror/releases/mame0%{baseversion}s.exe Source1: http://www.mess.org/files/%{name}0%{baseversion}s.zip +%endif Source2: ctrlr.rar -#ui.bdc generated from ui.bdf -#Source2: ui.bdc Patch0: %{name}-fortify.patch Patch1: %{name}-verbosebuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,11 +69,17 @@ %prep +%if 0%{?snapshot} +%setup -qn %{name} +%else %setup -qcT 7za x %{SOURCE0} +#mess does not need mame hash files +rm -rf hash find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \; unzip -o %{SOURCE1} -#patch0 -p1 -b .fortify +%endif +%patch0 -p1 -b .fortify %patch1 -p1 -b .verbosebuild # Remove windows-specific documentation @@ -117,63 +126,68 @@ # Fedora custom defaults video opengl autosave 1 -joystick 1 EOF %build +#these flags are already included in the Makefile +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//) + %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all TARGET=mess + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all TARGET=mess %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all TARGET=mess + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all TARGET=mess %endif %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT # create directories -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir}/%{name}/artwork -install -d %{buildroot}%{_datadir}/%{name}/roms -install -d %{buildroot}%{_datadir}/%{name}/ctrlr -install -d %{buildroot}%{_datadir}/%{name}/fonts -install -d %{buildroot}%{_datadir}/%{name}/hash -install -d %{buildroot}%{_datadir}/%{name}/samples -install -d %{buildroot}%{_datadir}/%{name}/software -install -d %{buildroot}%{_datadir}/%{name}/cheats -install -d %{buildroot}%{_sysconfdir}/%{name} -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap +install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/software +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats +install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/diff +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/ini +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/inp +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/memcard +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap # Install binaries and config files %if %{with debug} -install -pm 755 %{name}d %{buildroot}%{_bindir} +install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir} +%else +install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} +%endif +%if 0%{?snapshot} +install -pm 755 castool dat2html imgtool $RPM_BUILD_ROOT%{_bindir} %else -install -pm 755 %{name} %{buildroot}%{_bindir} +install -pm 755 castool dat2html imgtool messtest $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 castool dat2html imgtool messtest %{buildroot}%{_bindir} -install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/%{name} -install -pm 644 artwork/* %{buildroot}%{_datadir}/%{name}/artwork -#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts -install -pm 644 hash/* %{buildroot}%{_datadir}/%{name}/hash -install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name} +install -pm 644 sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/%{name} +install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name} # Install controller files -unrar x %{SOURCE2} %{buildroot}%{_datadir}/%{name} +unrar x %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name} %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files @@ -200,10 +214,16 @@ %files tools %defattr(-,root,root,-) %doc imgtool.txt +%if 0%{?snapshot} +%{_bindir}/castool +%{_bindir}/dat2html +%{_bindir}/imgtool +%else %{_bindir}/castool %{_bindir}/dat2html %{_bindir}/imgtool %{_bindir}/messtest +%endif %files data %defattr(-,root,root,-) @@ -214,6 +234,14 @@ %changelog +* Mon Apr 04 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.142-1 +- Updated to 0.142 +- Provided an easy way to build a SVN snapshot +- Filtered out redundant $RPM_OPT_FLAGS +- No longer enable joystick by default +- Re-enabled the fortify patch +- Delete mame hash files + * Fri Jan 14 2011 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.141-1 - Updated to 0.141 - Temporarily dropped the fortify patch Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mess/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Jan 2011 20:08:26 -0000 1.5 +++ sources 4 Apr 2011 19:45:28 -0000 1.6 @@ -1,3 +1,3 @@ d907085f2f69b74198796378e3ed0cb3 ctrlr.rar -b19481d31b2d7d94c193f3e47cc5a461 mame0141s.exe -67459d2e86ffb9569c93a8ab71c28132 mess0141s.zip +56fa8befc6bc768906e4235ba906453c mame0142s.exe +fecff43a5380267bcedba135581682a5 mess0142s.zip