rpms/mess/F-15 .cvsignore, 1.9, 1.10 mess.spec, 1.9, 1.10 sources, 1.9, 1.10 mess-systemlibs.patch, 1.1, NONE

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/mess/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24773

Modified Files:
	.cvsignore mess.spec sources 
Removed Files:
	mess-systemlibs.patch 
Log Message:
* Wed May 23 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.146-1
- Updated to 0.146
- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
- Dropped the systemlibs patch (no longer necessary)
- Added keymaps and shaders to the installed files
- Cleaned up the spec to match the mame one more closely



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Feb 2012 19:58:23 -0000	1.9
+++ .cvsignore	24 May 2012 21:09:24 -0000	1.10
@@ -1,2 +1,2 @@
 ctrlr.rar
-mess0145s.zip
+mess0146s.zip


Index: mess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/mess.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mess.spec	7 Feb 2012 19:58:23 -0000	1.9
+++ mess.spec	24 May 2012 21:09:24 -0000	1.10
@@ -1,7 +1,7 @@
 # the debug build is disabled by default, please use --with debug to override
 %bcond_with debug
 
-%global baseversion 145
+%global baseversion 146
 %global snapshot 0
 
 Name:           mess
@@ -22,7 +22,6 @@
 Source1:        ctrlr.rar
 Patch0:         %{name}-fortify.patch
 Patch1:         %{name}-verbosebuild.patch
-Patch2:         %{name}-systemlibs.patch
 
 BuildRequires:  expat-devel
 BuildRequires:  flac-devel
@@ -34,6 +33,8 @@
 BuildRequires:  zlib-devel
 
 Provides:       sdlmess = 0%{baseversion}-%{release}
+Provides:       bundled(libjpeg) = 8c
+Provides:       bundled(lzma-sdk) = 9.22
 Obsoletes:      sdlmess < 0136-2
 
 %description
@@ -79,7 +80,6 @@
 %endif
 %patch0 -p1 -b .fortify
 %patch1 -p1 -b .verbosebuild
-%patch2 -p1 -b .systemlibs
 
 # Remove windows-specific documentation
 rm -fr docs/win*
@@ -94,12 +94,12 @@
 cat > %{name}.ini << EOF
 # Define multi-user paths
 artpath            %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
+cheatpath          %{_datadir}/%{name}/cheats
 ctrlrpath          %{_datadir}/%{name}/ctrlr
 fontpath           %{_datadir}/%{name}/fonts
 hashpath           %{_datadir}/%{name}/hash
-rompath            %{_datadir}/%{name}/roms
+rompath            %{_datadir}/%{name}/roms;%{_datadir}/%{name}/chds
 samplepath         %{_datadir}/%{name}/samples
-cheatpath          %{_datadir}/%{name}/cheats
 
 # Allow user to override ini settings
 inipath            \$HOME/.%{name}/ini;%{_sysconfdir}/%{name}
@@ -139,15 +139,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 # create directories
-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
@@ -156,10 +147,25 @@
 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 -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/software
 
-# Install binaries and config files
+# install files
+install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %if %{with debug}
 install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir}
 %else
@@ -169,7 +175,10 @@
 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 -pm 644 hlsl/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl
+install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
+install -pm 644 src/osd/sdl/shader/*.?sh $RPM_BUILD_ROOT%{_datadir}/%{name}/shader
+
 
 # Install controller files
 unrar x %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -179,6 +188,7 @@
 %doc *.txt docs/*
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
 %dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/skel/.%{name}
 %if %{with debug}
 %{_bindir}/%{name}d
 %else
@@ -186,14 +196,19 @@
 %endif
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/artwork
-%dir %{_datadir}/%{name}/roms
+%dir %{_datadir}/%{name}/chds
+%dir %{_datadir}/%{name}/cheats
 %dir %{_datadir}/%{name}/ctrlr
+%dir %{_datadir}/%{name}/effects
 %{_datadir}/%{name}/fonts
 %dir %{_datadir}/%{name}/hash
+%dir %{_datadir}/%{name}/hlsl
+%{_datadir}/%{name}/keymaps
+%dir %{_datadir}/%{name}/roms
 %dir %{_datadir}/%{name}/samples
+%dir %{_datadir}/%{name}/shader
 %dir %{_datadir}/%{name}/software
-%dir %{_datadir}/%{name}/cheats
-%{_sysconfdir}/skel/.%{name}
+
 
 %files tools
 %doc imgtool.txt
@@ -206,9 +221,18 @@
 %{_datadir}/%{name}/artwork/*
 %{_datadir}/%{name}/ctrlr/*
 %{_datadir}/%{name}/hash/*
+%{_datadir}/%{name}/hlsl/*
+%{_datadir}/%{name}/shader/*
 
 
 %changelog
+* Wed May 23 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.146-1
+- Updated to 0.146
+- Added bundled(libjpeg) and bundled(lzma-sdk) Provides
+- Dropped the systemlibs patch (no longer necessary)
+- Added keymaps and shaders to the installed files
+- Cleaned up the spec to match the mame one more closely
+
 * Tue Feb 07 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.145-1
 - Updated to 0.145
 - Patched to use system libflac, libjpeg needs more work


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Feb 2012 19:58:23 -0000	1.9
+++ sources	24 May 2012 21:09:24 -0000	1.10
@@ -1,2 +1,2 @@
 d907085f2f69b74198796378e3ed0cb3  ctrlr.rar
-3beb88328d0627b21e6e122572526110  mess0145s.zip
+3ad4e780d1d7d3b66edf985417018c5b  mess0146s.zip


--- mess-systemlibs.patch DELETED ---