dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xeuphoric
-# $Id$
-NAME := xeuphoric
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xeuphoric-config.patch

@@ -1,11 +0,0 @@
---- xeuphoric-0.18.2/configure	2006-08-19 21:47:44.000000000 +0100
-+++ xeuphoric-0.18.2/configure	2006-08-25 23:04:42.000000000 +0100
-@@ -21,7 +21,7 @@
- 
- set -e
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- APPNAME=xeuphoric
- 
- while [ "$#" -ne 0 ]

xeuphoric.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=xeuphoric
-Comment=An ORIC home computer emulator
-Icon=xeuphoric.png
-Terminal=false
-Type=Application
-Categories=Application;Emulators;
-Exec=xeuphoric
-

xeuphoric.spec

@@ -1,19 +1,20 @@
-Summary: An X based ORIC emulator
-Name: xeuphoric
-Version: 0.18.2
-Release: 6%{?dist}
-License: GPL
-Group: Applications/Emulators
-Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
-URL: http://www.treaser.fr/~amajorel/%{name}
-Source1: xeuphoric.desktop
-Source2: xeuphoric.png
-Patch0: xeuphoric-config.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: arts-devel libXext-devel desktop-file-utils
-Requires: %{name}-roms
-ExcludeArch: x86_64 ia64 ppc
-# excluded due to compilation problems - upstream developer changing RSN (me!)
+Name:           xeuphoric
+Version:        0.18.2
+Release:        7%{?dist}
+Summary:        An X based ORIC emulator
+Group:          Applications/Emulators
+License:        GPL
+URL:            http://www.teaser.fr/~amajorel/xeuphoric/
+Source0:        http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz
+Source1:        xeuphoric.png
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  arts-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  libXext-devel
+Requires:       %{name}-roms
+Requires:       hicolor-icon-theme
+ExcludeArch:    x86_64 ia64 ppc ppc64
+# excluded due to compilation problems - upstream developer changing RSN (me!) -Paul
 
 %description
 xeuphoric is an X based ORIC emulator which has full support for sound,
@@ -21,68 +22,150 @@ HIRES graphics, saving, loading and emulation of the original ORIC-1, Oric
 Atmos (default) and the Telestat (which would have come next had Oric not
 vanished under the waves!)
 
+
 %package roms
-Summary : ROMS required for %{name}
-Group: Applications/Emulators
-Requires: %{name} = %{version}-%{release}
+Summary:    ROMS required for %{name}
+Group:      Applications/Emulators
+Requires:   %{name} = %{version}-%{release}
 
 %description roms
 ROMS required to run %{name}
 
+
 %prep
-%setup -q 
-%patch0 -p1
-sed -i 's/\r//' doc/euphoric-0.99b/*
-%{_bindir}/iconv -t UTF-8 docsrc/xeuphoric.1 -o docsrc/xeuphoric.1
+%setup -q
+sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' configure
+# Character encoding fixes
+pushd docsrc
+iconv -f iso8859-1 xeuphoric.1 -t utf8 > xeuphoric.1.conv \
+    && /bin/mv -f xeuphoric.1.conv xeuphoric.1
+popd
+pushd doc/euphoric-0.99b
+sed -i 's|\r||' *
+sed -i 's|\x1A\xFF||g' HISTORIC
+sed -i 's|\xA3||g' HISTORIC
+iconv -f iso8859-1 HISTORIQ -t utf8 > HISTORIQ.conv \
+    && /bin/mv -f HISTORIQ.conv HISTORIQ
+iconv -f iso8859-1 LISEZMOI -t utf8 > LISEZMOI.conv \
+    && /bin/mv -f LISEZMOI.conv LISEZMOI
+iconv -f iso8859-1 MANUAL -t utf8 > MANUAL.conv \
+    && /bin/mv -f MANUAL.conv MANUAL
+iconv -f iso8859-1 MANUEL -t utf8 > MANUEL.conv \
+    && /bin/mv -f MANUEL.conv MANUEL
+popd
+
 
 %build
+# Note, not an autotools configure!
 ./configure
 make CFLAGS="-DX11 %{optflags}" %{?_smp_mflags}
 
+# Generate desktop files
+cat >%{name}-atmos.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=XEuphoric (Atmos)
+GenericName=(ORIC Emulator)
+Comment=%{summary}
+Exec=%{name}
+Icon=%{name}.png
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+EOF
+
+# Generate desktop files
+cat >%{name}-oric1.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=XEuphoric (ORIC-1)
+GenericName=(ORIC Emulator)
+Comment=%{summary}
+Exec=%{name} -1
+Icon=%{name}.png
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+EOF
+
+# Generate desktop files
+cat >%{name}-telestrat.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=XEuphoric (Telestrat)
+GenericName=(ORIC Emulator)
+Comment=%{summary}
+Exec=%{name} -t
+Icon=%{name}.png
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
+EOF
+
+
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 mkdir -p %{buildroot}%{_datadir}/%{name}/%{version}
+mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/%{version}
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/pixmaps
 
-install -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
-cp docsrc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-cp *.rom %{buildroot}%{_datadir}/%{name}/%{version}
-cp %{SOURCE1} %{buildroot}%{_datadir}/applications
-install -m 0644 .xeuphoricrc %{buildroot}%{_sysconfdir}/%{name}/%{version}/xeuphoricrc
-install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -pm 0755 %{name} %{buildroot}%{_bindir}
+install -pm 0644 docsrc/%{name}.1 %{buildroot}%{_mandir}/man1
+install -pm 0644 *.rom %{buildroot}%{_datadir}/%{name}/%{version}
+install -pm 0644 .xeuphoricrc %{buildroot}%{_sysconfdir}/%{name}/%{version}/xeuphoricrc
+install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 desktop-file-install --vendor fedora \
-    --dir %{buildroot}%{_datadir}/applications \
-    --add-category X-Fedora \
-    --delete-original \
-    %{buildroot}%{_datadir}/applications/xeuphoric.desktop
+                     --dir %{buildroot}%{_datadir}/applications \
+                     %{name}-atmos.desktop
+
+desktop-file-install --vendor fedora \
+                     --dir %{buildroot}%{_datadir}/applications \
+                     %{name}-oric1.desktop
+
+desktop-file-install --vendor fedora \
+                     --dir %{buildroot}%{_datadir}/applications \
+                     %{name}-telestrat.desktop
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
-update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %postun
-update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %files
 %defattr(-,root,root)
 %doc doc/euphoric-0.99b/* COPYING
 %{_bindir}/%{name}
 %{_mandir}/man1/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %config (noreplace) %{_sysconfdir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+
 
 %files roms
-%{_datadir}/%{name}/
+%{_datadir}/%{name}
+
 
 %changelog
+* Fri Jun 29 2007 Ian Chapman <packages@amiga-hardware.com> 0.18.2-7%{?dist}
+- Various cleanups to the SPEC including conforming to new guidelines
+- Fix BZ #245091
+- Additional .desktop files for other emulator models
+- Encoding fixes for documentation
+- Fixed installation of broken man page
+
 * Sat Oct 21 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> - 0.18.2-6
 - changed ppc64 to ppc
 
@@ -105,4 +188,3 @@ update-desktop-database &> /dev/null || :
 - Initial import into FE
 - created datapath patch
 - added own makeinstall as the provided one is broken
-