From ca7f8abd6b07f62a452a3ea8dc0eac207ea6f65c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:18:36 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for xeuphoric --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 6e584cb5c0628350f96dc2e9e7d256b48c5b0d8c Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sat, 30 Jun 2007 17:28:37 +0000 Subject: [PATCH 2/4] *** empty log message *** --- xeuphoric-config.patch | 11 --- xeuphoric.desktop | 11 --- xeuphoric.spec | 166 ++++++++++++++++++++++++++++++----------- 3 files changed, 124 insertions(+), 64 deletions(-) delete mode 100644 xeuphoric-config.patch delete mode 100644 xeuphoric.desktop diff --git a/xeuphoric-config.patch b/xeuphoric-config.patch deleted file mode 100644 index ef4f066..0000000 --- a/xeuphoric-config.patch +++ /dev/null @@ -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 ] diff --git a/xeuphoric.desktop b/xeuphoric.desktop deleted file mode 100644 index bb87879..0000000 --- a/xeuphoric.desktop +++ /dev/null @@ -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 - diff --git a/xeuphoric.spec b/xeuphoric.spec index 9ce830f..e5e4b1b 100644 --- a/xeuphoric.spec +++ b/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 <%{name}-oric1.desktop <%{name}-telestrat.desktop < /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 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 - 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 - From 47f9c1f47447a1efac505b8d0f59aaf7d0407281 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:47 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5e6fab6..ff8f15b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xeuphoric -# $Id$ +# $Id: Makefile,v 1.1 2006/10/15 21:55:31 pfj Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 33433a5d9478aced5d559c014cadc1098f3c51d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:01 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ff8f15b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xeuphoric -# $Id: Makefile,v 1.1 2006/10/15 21:55:31 pfj Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7