[openmsx] New upstream release 0.10.0 (rhbz#1048800)

Hans de Goede jwrdegoede at fedoraproject.org
Sat Mar 8 19:10:23 UTC 2014


commit 38a8c0daa447ac1dd1922eee6008348a381db5fe
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Mar 8 20:10:11 2014 +0100

    New upstream release 0.10.0 (rhbz#1048800)

 .gitignore                      |    1 +
 openmsx-0.6.1-installbase.patch |   14 ++++++++------
 openmsx.spec                    |   23 +++++++----------------
 sources                         |    2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dda2969..5483c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ openmsx-0.7.2.tar.gz
 /openmsx-0.8.2.tar.gz
 /openmsx-0.9.0.tar.gz
 /openmsx-0.9.1.tar.gz
+/openmsx-0.10.0.tar.gz
diff --git a/openmsx-0.6.1-installbase.patch b/openmsx-0.6.1-installbase.patch
index 03f5c73..11d2ade 100644
--- a/openmsx-0.6.1-installbase.patch
+++ b/openmsx-0.6.1-installbase.patch
@@ -1,16 +1,16 @@
-diff -up openmsx-0.7.2/build/custom.mk.orig openmsx-0.7.2/build/custom.mk
---- openmsx-0.7.2/build/custom.mk.orig	2009-06-29 23:38:05.000000000 +0200
-+++ openmsx-0.7.2/build/custom.mk	2009-07-03 12:37:05.000000000 +0200
-@@ -6,7 +6,7 @@
+diff -up openmsx-0.10.0/build/custom.mk.installbase openmsx-0.10.0/build/custom.mk
+--- openmsx-0.10.0/build/custom.mk.installbase	2014-01-05 22:09:53.000000000 +0100
++++ openmsx-0.10.0/build/custom.mk	2014-03-08 19:44:13.124017063 +0100
+@@ -4,7 +4,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
+ # Add revision number to executable file name? This applies only to
  # development versions, not to release versions (see version.py).
-@@ -16,7 +16,7 @@ VERSION_EXEC:=false
+@@ -14,8 +14,8 @@ VERSION_EXEC:=false
  # 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.
@@ -19,3 +19,5 @@ diff -up openmsx-0.7.2/build/custom.mk.orig openmsx-0.7.2/build/custom.mk
  
  # Install content of Contrib/ directory?
  # Currently this contains a version of C-BIOS.
+-INSTALL_CONTRIB:=true
++INSTALL_CONTRIB:=false
diff --git a/openmsx.spec b/openmsx.spec
index 9243dfe..a2fd617 100644
--- a/openmsx.spec
+++ b/openmsx.spec
@@ -1,6 +1,6 @@
 Name:           openmsx
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
@@ -44,15 +44,6 @@ CXXFLAGS+=%{optflags} -DNDEBUG
 OPENMSX_STRIP:=false
 EOF
 
-# Give README's a sensible name
-echo 'System ROM Dir: %{_datadir}/%{name}/systemroms' > doc/systemroms-README
-cat share/systemroms/README >> doc/systemroms-README
-touch -r share/systemroms/README doc/systemroms-README
-
-echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN' > doc/Boosted_MSX2_EN-README
-cat share/machines/Boosted_MSX2_EN/README >> doc/Boosted_MSX2_EN-README
-touch -r share/machines/Boosted_MSX2_EN/README doc/Boosted_MSX2_EN-README
-
 
 %build
 %configure
@@ -81,12 +72,9 @@ make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
      INSTALL_DOC_DIR=%{_docdir}/%{name} \
      DESTDIR=$RPM_BUILD_ROOT install
 
-# These files are part of the CBIOS package (were they are build from source)
-rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/machines/C-BIOS_MSX*
-
 # Move some things around
-rm $(find $RPM_BUILD_ROOT%{_datadir}/%{name} -name README)
-install -m 644 doc/*-README $RPM_BUILD_ROOT%{_docdir}/%{name}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/machines/*.txt \
+   $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.xml \
@@ -133,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Mar 08 2014 Hans de Goede <hdegoede at redhat.com> - 0.10.0-1
+- New upstream release 0.10.0 (rhbz#1048800)
+
 * Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 0.9.1-2
 - rebuilt for GLEW 1.10
 
diff --git a/sources b/sources
index d8f5875..bb42712 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37f9706652add2c881dcae4afdf00664  openmsx-0.9.1.tar.gz
+0c528038010fa7160cffb9ae543f0bf0  openmsx-0.10.0.tar.gz


More information about the scm-commits mailing list