rpms/openmsx/F-7 openmsx-0.6.1-datadir.patch, NONE, 1.1 openmsx-0.6.1-flavour.patch, NONE, 1.1 openmsx-0.6.1-installbase.patch, NONE, 1.1 openmsx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Ian Chapman (oddsocks) fedora-extras-commits at redhat.com
Tue Aug 28 19:45:26 UTC 2007


Author: oddsocks

Update of /cvs/pkgs/rpms/openmsx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17768/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	openmsx-0.6.1-datadir.patch openmsx-0.6.1-flavour.patch 
	openmsx-0.6.1-installbase.patch openmsx.spec 
Log Message:
Initial import

openmsx-0.6.1-datadir.patch:

--- NEW FILE openmsx-0.6.1-datadir.patch ---
--- openmsx-0.6.1/build/info2code.mk.orig	2006-01-19 18:39:49.000000000 +0000
+++ openmsx-0.6.1/build/info2code.mk	2006-08-11 00:31:11.000000000 +0100
@@ -30,7 +30,7 @@
 # Don't call it "BIG_ENDIAN", because some system header may #define that.
 	@echo "static const bool OPENMSX_BIGENDIAN = $(BIG_ENDIAN);" >> $@
 	@echo "static const bool OPENMSX_SET_WINDOW_ICON = $(SET_WINDOW_ICON);" >> $@
-	@echo "static const std::string DATADIR = \"$(INSTALL_SHARE_DIR)\";" >> $@
+	@echo "static const std::string DATADIR = \"/usr/share/openmsx\";" >> $@
 	@echo "" >> $@
 	@echo "} // namespace openmsx" >> $@
 	@echo "" >> $@

openmsx-0.6.1-flavour.patch:

--- NEW FILE openmsx-0.6.1-flavour.patch ---
--- openmsx-0.6.1/build/cpu-x86.mk.orig	2006-07-23 19:50:57.000000000 +0100
+++ openmsx-0.6.1/build/cpu-x86.mk	2006-08-06 18:30:46.000000000 +0100
@@ -9,7 +9,7 @@
 ifeq ($(filter darwin%,$(OPENMSX_TARGET_OS)),)
 # To run openMSX with decent speed, at least a Pentium 2 class machine
 # is needed, so let's optimise for that.
-OPENMSX_FLAVOUR?=i686
+OPENMSX_FLAVOUR?=rpm
 else
 # The system headers of OS X use SSE features, which are not available on
 # i686, so we only use the generic optimisation flags instead.
--- openmsx-0.6.1/build/cpu-ppc.mk.orig	2004-07-10 16:25:01.000000000 +0100
+++ openmsx-0.6.1/build/cpu-ppc.mk	2006-08-13 16:07:26.000000000 +0100
@@ -6,5 +6,5 @@
 BIG_ENDIAN:=true
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=ppc
+OPENMSX_FLAVOUR?=rpm
 
--- openmsx-0.6.1/build/cpu-x86_64.mk.orig	2004-10-09 07:32:02.000000000 +0100
+++ openmsx-0.6.1/build/cpu-x86_64.mk	2006-08-13 16:07:38.000000000 +0100
@@ -6,5 +6,5 @@
 BIG_ENDIAN:=false
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=opt
+OPENMSX_FLAVOUR?=rpm
 

openmsx-0.6.1-installbase.patch:

--- NEW FILE openmsx-0.6.1-installbase.patch ---
--- openmsx-0.6.1/build/custom.mk.orig	2005-12-22 04:53:18.000000000 +0000
+++ openmsx-0.6.1/build/custom.mk	2006-08-06 18:28:59.000000000 +0100
@@ -6,7 +6,7 @@
 # openMSX is always installed into a single self-contained directory.
 # But you can change that directory to for example /usr/local/openMSX
 # or /usr/games/openMSX if you like.
-INSTALL_BASE:=/opt/openMSX
+INSTALL_BASE:=/usr
 
 # Add ChangeLog version number to executable file name? This applies only to
 # development versions, not to release versions (see version.mk).
@@ -16,7 +16,7 @@
 # This link is placed in a location that is typically in a user's path:
 # /usr/local/bin for system-wide installs and ~/bin for personal installs.
 # This setting is only relevant on systems that support symbolic links.
-SYMLINK_FOR_BINARY:=true
+SYMLINK_FOR_BINARY:=false
 
 # Install content of Contrib/ directory?
 # Currently this contains a version of C-BIOS.


--- NEW FILE openmsx.spec ---
Name:           openmsx
Version:        0.6.2
Release:        4%{?dist}
Summary:        An emulator for the MSX home computer system
Group:          Applications/Emulators
License:        GPL+
URL:            http://openmsx.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0:         openmsx-0.6.1-installbase.patch
Patch1:         openmsx-0.6.1-flavour.patch
Patch2:         openmsx-0.6.1-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildRequires:  docbook-utils
BuildRequires:  glew-devel >= 1.3.2
BuildRequires:  ImageMagick
BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  libpng-devel
BuildRequires:  libxml2-devel
BuildRequires:  SDL_image-devel
BuildRequires:  tcl-devel >= 8.4.0
BuildRequires:  zlib-devel
Requires:       cbios-%{name}
Requires:       hicolor-icon-theme

%description
openMSX is an emulator for the MSX home computer system. Its goal is to emulate
all aspects of the MSX with 100% accuracy.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1

# Verbose compilation
sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk

# Correct some permissions
chmod 0644 share/extensions/rs232/hardwareconfig.xml share/extensions/gfx9000/hardwareconfig.xml \
           share/extensions/debugdevice/hardwareconfig.xml

# Make the custom flavour module, so we can use RPM OPT FLAGS here
cat > build/flavour-rpm.mk << EOF
# $Id: flavour-rpm.mk,v 1.1 2006/08/06 06:32:02 mthuurne Exp $
#
# RPM opt flavour:

# Opt flags.
CXXFLAGS+=%{optflags}

# Dont strip exe, let rpm do it and save debug info
OPENMSX_STRIP:=false
EOF

# Move documentation to a sensible location
echo 'System ROM Dir: %{_datadir}/%{name}/systemroms' > systemroms-README
cat share/systemroms/README >> doc/systemroms-README
rm -f share/systemroms/README

echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN/roms' > Boosted_MSX2_EN-roms-README
cat share/machines/Boosted_MSX2_EN/roms/README >> doc/Boosted_MSX2_EN-roms-README
rm -f share/machines/Boosted_MSX2_EN/roms/README

echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN' > Boosted_MSX2_EN-README
cat share/machines/Boosted_MSX2_EN/README >> doc/Boosted_MSX2_EN-README
rm -f share/machines/Boosted_MSX2_EN/README


%build
%configure
make %{?_smp_mflags}

# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=openMSX
GenericName=: An MSX Emulator
Comment=%{summary}
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF

# Build the man page
docbook2man doc/openmsx.sgml -o ./
mv OPENMSX.1 openmsx.1

#Build icon
convert -resize 192x192 -extent 192x192 -transparent '#000000' \
    -roll '-0x+65' share/skins/ConsoleBackground.png %{name}.png


%install
rm -rf %{buildroot}
# Some clean ups before installing
rm -f share/systemroms/.cvsignore doc/node.mk doc/openmsx.sgml \
      doc/manual/node.mk share/extensions/msxdos2/roms/SHA1SUMS

mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/192x192/apps
mkdir -p %{buildroot}%{_mandir}/man1
install -pm 0755 derived/%{name} %{buildroot}%{_bindir}
install -pm 0644 openmsx.1 %{buildroot}%{_mandir}/man1
cp -a share/extensions share/keymaps share/machines share/scripts \
     share/shaders share/skins share/systemroms %{buildroot}%{_datadir}/%{name}
install -pm 0644 share/softwaredb.xml %{buildroot}%{_datadir}/%{name}
install -pm 0644 share/init.tcl %{buildroot}%{_datadir}/%{name}
install -pm 0644 share/settings.xml %{buildroot}%{_sysconfdir}/%{name}
ln -s --target-directory=%{buildroot}%{_datadir}/%{name} \
   ../../../etc/openmsx/settings.xml
install -pm 0755 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/192x192/apps

rm -f doc/node.mk
rm -f doc/manual/node.mk

desktop-file-install --vendor fedora \
                     --dir %{buildroot}%{_datadir}/applications \
                     %{name}.desktop


%clean
rm -rf %{buildroot}


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/192x192/apps/%{name}.png
%{_mandir}/man1/%{name}.1.gz
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/settings.xml
%doc AUTHORS ChangeLog GPL README doc/*


%changelog
* Mon Aug 27 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.2-4
- License field corrected

* Sun Aug 26 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.2-3
- Migration to Fedora
- License field changed due to new guidelines

* Sun May 06 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.2-2
- Rebuild for glew 1.4.0

* Fri Apr 27 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.2-1
- Upgrade to 0.6.2
- Increased compilation verbosity

* Sun Mar 11 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.1-2
- Dropped dribble-menus requirement, due to be obsoleted
- Changed .desktop category to Game;Emulator;
- Create the desktop icon from the skins (instead of using our own)

* Sun Aug 06 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.1-1
- Initial release

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Aug 2007 18:46:24 -0000	1.1
+++ .cvsignore	28 Aug 2007 19:44:54 -0000	1.2
@@ -0,0 +1 @@
+openmsx-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Aug 2007 18:46:24 -0000	1.1
+++ sources	28 Aug 2007 19:44:54 -0000	1.2
@@ -0,0 +1 @@
+282acf2ea7bf67e15a7b8d961c9556a5  openmsx-0.6.2.tar.gz




More information about the fedora-extras-commits mailing list