rpms/openmsx/devel .cvsignore, 1.4, 1.5 openmsx-0.6.1-installbase.patch, 1.1, 1.2 openmsx.spec, 1.10, 1.11 sources, 1.4, 1.5

Fri Jul 3 13:15:49 UTC 2009

Author: jwrdegoede

Update of /cvs/extras/rpms/openmsx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25387

Modified Files:
	.cvsignore openmsx-0.6.1-installbase.patch openmsx.spec 
	sources 
Log Message:
* Fri Jul  3 2009 Hans de Goede <hdegoede at redhat.com> 0.7.2-1
- New upstream release 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	10 Apr 2009 14:04:10 -0000	1.4
+++ .cvsignore	3 Jul 2009 13:15:19 -0000	1.5
@@ -1 +1 @@
-openmsx-0.7.0.tar.gz
+openmsx-0.7.2.tar.gz

openmsx-0.6.1-installbase.patch:

Index: openmsx-0.6.1-installbase.patch
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/openmsx-0.6.1-installbase.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openmsx-0.6.1-installbase.patch	28 Aug 2007 19:41:35 -0000	1.1
+++ openmsx-0.6.1-installbase.patch	3 Jul 2009 13:15:19 -0000	1.2
@@ -1,5 +1,6 @@
---- 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
+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 @@
  # openMSX is always installed into a single self-contained directory.
  # But you can change that directory to for example /usr/local/openMSX
@@ -8,8 +9,8 @@
 +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 @@
+ # development versions, not to release versions (see version.py).
+@@ -16,7 +16,7 @@ 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.


Index: openmsx.spec
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/openmsx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openmsx.spec	10 Apr 2009 14:04:10 -0000	1.10
+++ openmsx.spec	3 Jul 2009 13:15:19 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           openmsx
-Version:        0.7.0
+Version:        0.7.2
 Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
@@ -7,8 +7,6 @@ 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.3-datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
@@ -30,8 +28,6 @@ all aspects of the MSX with 100% accurac
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # Verbose compilation
 sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk
@@ -46,34 +42,37 @@ cat > build/flavour-rpm.mk << EOF
 # RPM opt flavour:
 
 # Opt flags.
-CXXFLAGS+=%{optflags}
+CXXFLAGS+=%{optflags} -DNDEBUG
 
 # 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
+# Give README's a sensible name
+echo 'System ROM Dir: %{_datadir}/%{name}/systemroms' > doc/systemroms-README
 cat share/systemroms/README >> doc/systemroms-README
-rm -f share/systemroms/README
+touch -r share/systemroms/README doc/systemroms-README
 
-echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN/roms' > Boosted_MSX2_EN-roms-README
+echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN/roms' > doc/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
+touch -r share/machines/Boosted_MSX2_EN/roms/README doc/Boosted_MSX2_EN-roms-README
 
-echo '%{_datadir}/%{name}/machines/Boosted_MSX2_EN' > Boosted_MSX2_EN-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
-rm -f share/machines/Boosted_MSX2_EN/README
+touch -r share/machines/Boosted_MSX2_EN/README doc/Boosted_MSX2_EN-README
+
+# Some clean ups
+rm share/extensions/msxdos2/roms/SHA1SUMS
 
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
+     INSTALL_DOC_DIR=%{_docdir}/%{name}-%{version}
 
 # Build desktop icon
 cat >%{name}.desktop <<EOF
 [Desktop Entry]
-Encoding=UTF-8
 Name=openMSX
 GenericName=An MSX Emulator
 Comment=%{summary}
@@ -89,60 +88,59 @@ docbook2man doc/openmsx.sgml -o ./
 
 
 %install
-rm -rf %{buildroot}
-# Some clean ups before installing
-rm -f share/systemroms/.cvsignore doc/{node.mk,openmsx.sgml,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/{16x16,32x32,48x48,64x64,128x128}/apps
-mkdir -p %{buildroot}%{_mandir}/man1
-
-install -pm 0755 derived/%{name} %{buildroot}%{_bindir}
-install -pm 0644 OPENMSX.1 %{buildroot}%{_mandir}/man1/openmsx.1
-cp -a share/{extensions,keymaps,machines,scripts,shaders,skins,systemroms,unicodemaps} \
-    %{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} \
+rm -rf $RPM_BUILD_ROOT
+make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
+     INSTALL_DOC_DIR=%{_docdir}/%{name}-%{version} \
+     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}-%{version}
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.xml \
+   $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+ln -s --target-directory=$RPM_BUILD_ROOT%{_datadir}/%{name} \
    ../../../etc/openmsx/settings.xml
 
-# Install icon set
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 0644 OPENMSX.1 $RPM_BUILD_ROOT%{_mandir}/man1/openmsx.1
+
+# Install icon set and desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64,128x128}/apps
 for i in 16 32 48 64 128; do
 install -pm 0644 share/icons/openMSX-logo-"$i".png \
-    %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps/%{name}.png
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/"$i"x"$i"/apps/%{name}.png
 done
 
-rm -f doc/{node.mk,manual/node.mk}
-
 desktop-file-install --vendor fedora \
-                     --dir %{buildroot}%{_datadir}/applications \
+                     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
                      %{name}.desktop
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %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
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -150,10 +148,12 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/settings.xml
-%doc AUTHORS ChangeLog GPL README doc/*
 
 
 %changelog
+* Fri Jul  3 2009 Hans de Goede <hdegoede at redhat.com> 0.7.2-1
+- New upstream release 0.7.2
+
 * Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 0.7.0-1
 - New upstream release 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openmsx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Apr 2009 14:04:10 -0000	1.4
+++ sources	3 Jul 2009 13:15:19 -0000	1.5
@@ -1 +1 @@
-ea5c07225ee28713c0cda8f8edcfab05  openmsx-0.7.0.tar.gz
+1f6338be7d3db6827ddb7b57daa8e37f  openmsx-0.7.2.tar.gz


