rpms/openmsx/devel openmsx-0.6.3-datadir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 openmsx.spec, 1.2, 1.3 sources, 1.2, 1.3 openmsx-0.6.1-datadir.patch, 1.1, NONE

Wed Jan 9 19:31:22 UTC 2008

Author: oddsocks

Update of /cvs/pkgs/rpms/openmsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6519

Modified Files:
	.cvsignore openmsx.spec sources 
Added Files:
	openmsx-0.6.3-datadir.patch 
Removed Files:
	openmsx-0.6.1-datadir.patch 
Log Message:


openmsx-0.6.3-datadir.patch:

--- NEW FILE openmsx-0.6.3-datadir.patch ---
--- openmsx-0.6.3/build/info2code.mk.orig	2007-12-09 21:09:11.000000000 +0000
+++ openmsx-0.6.3/build/info2code.mk	2008-01-09 16:08:05.000000000 +0000
@@ -39,7 +39,7 @@
 	@echo "static const bool OPENMSX_BIGENDIAN = $(BIG_ENDIAN);" >> $@
 	@echo "static const bool OPENMSX_UNALIGNED_MEMORY_ACCESS = $(UNALIGNED_MEMORY_ACCESS);" >> $@
 	@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 "static const std::string BUILD_FLAVOUR = \"$(OPENMSX_FLAVOUR)\";" >> $@
 	@echo "static const std::string BUILD_COMPONENTS = \"$(sort $(COMPONENTS_TRUE))\";" >> $@
 	@echo "" >> $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Aug 2007 19:41:35 -0000	1.2
+++ .cvsignore	9 Jan 2008 19:30:47 -0000	1.3
@@ -1 +1 @@
-openmsx-0.6.2.tar.gz
+openmsx-0.6.3.tar.gz


Index: openmsx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/devel/openmsx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openmsx.spec	5 Jan 2008 14:00:27 -0000	1.2
+++ openmsx.spec	9 Jan 2008 19:30:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           openmsx
-Version:        0.6.2
-Release:        5%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
@@ -8,12 +8,11 @@
 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
+Patch2:         openmsx-0.6.3-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
@@ -38,8 +37,7 @@
 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
+chmod 0644 share/extensions/{rs232,gfx9000,debugdevice}/hardwareconfig.xml
 
 # Make the custom flavour module, so we can use RPM OPT FLAGS here
 cat > build/flavour-rpm.mk << EOF
@@ -77,10 +75,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=openMSX
-GenericName=: An MSX Emulator
+GenericName=An MSX Emulator
 Comment=%{summary}
 Exec=%{name}
-Icon=%{name}.png
+Icon=%{name}
 Terminal=false
 Type=Application
 Categories=Game;Emulator;
@@ -88,37 +86,37 @@
 
 # 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
+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/192x192/apps
+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
-cp -a share/extensions share/keymaps share/machines share/scripts \
-     share/shaders share/skins share/systemroms %{buildroot}%{_datadir}/%{name}
+install -pm 0644 OPENMSX.1 %{buildroot}%{_mandir}/man1/openmsx.1
+cp -a share/{extensions,keymaps,machines,scripts,shaders,skins,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
+# Install icon set
+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
+done
+
+rm -f doc/{node.mk,manual/node.mk}
 
 desktop-file-install --vendor fedora \
                      --dir %{buildroot}%{_datadir}/applications \
@@ -148,7 +146,7 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/192x192/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/settings.xml
@@ -156,6 +154,13 @@
 
 
 %changelog
+* Wed Jan 09 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.6.3-1
+- Upgrade to 0.6.3
+- Use the icons now supplied with openmsx instead of our own
+- Harmless permission fix
+- Some spec optimisations
+- Updated datadir patch
+
 * Sat Jan  5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.6.2-5
 - Rebuild for new Tcl 8.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openmsx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Aug 2007 19:41:35 -0000	1.2
+++ sources	9 Jan 2008 19:30:47 -0000	1.3
@@ -1 +1 @@
-282acf2ea7bf67e15a7b8d961c9556a5  openmsx-0.6.2.tar.gz
+29d4a4d9a1b6226c3aef85fa57fe9ca0  openmsx-0.6.3.tar.gz


--- openmsx-0.6.1-datadir.patch DELETED ---


