From 2bef9f5f2dd1f15b7fb1d2c715122508325440e2 Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sat, 30 Jun 2007 17:16:47 +0000 Subject: [PATCH 1/7] *** 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 93a1d6788d418eba8ee5d385211952592483d73e Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sun, 26 Aug 2007 15:49:09 +0000 Subject: [PATCH 2/7] *** empty log message *** --- xeuphoric.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xeuphoric.spec b/xeuphoric.spec index e5e4b1b..157048a 100644 --- a/xeuphoric.spec +++ b/xeuphoric.spec @@ -1,9 +1,10 @@ Name: xeuphoric Version: 0.18.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An X based ORIC emulator Group: Applications/Emulators -License: GPL +# The ROMs are believed to be public domain +License: GPLv2 and Public Domain URL: http://www.teaser.fr/~amajorel/xeuphoric/ Source0: http://www.teaser.fr/~amajorel/%{name}/%{name}-%{version}.tar.gz Source1: xeuphoric.png @@ -159,7 +160,11 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog -* Fri Jun 29 2007 Ian Chapman 0.18.2-7%{?dist} +* Tue Aug 21 2007 Ian Chapman 0.18.2-8 +- Release bump for F8 mass rebuild +- License change due to new guidelines + +* Fri Jun 29 2007 Ian Chapman 0.18.2-7 - Various cleanups to the SPEC including conforming to new guidelines - Fix BZ #245091 - Additional .desktop files for other emulator models From b085cdce49e457c5f594f7e96c44d6a03bd08d2e Mon Sep 17 00:00:00 2001 From: oddsocks Date: Fri, 28 Sep 2007 13:19:05 +0000 Subject: [PATCH 3/7] *** empty log message *** --- xeuphoric.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/xeuphoric.spec b/xeuphoric.spec index 157048a..b72a62e 100644 --- a/xeuphoric.spec +++ b/xeuphoric.spec @@ -1,6 +1,6 @@ Name: xeuphoric Version: 0.18.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An X based ORIC emulator Group: Applications/Emulators # The ROMs are believed to be public domain @@ -14,8 +14,8 @@ 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 +# Known to fail on x86_64, ppc, ppc64, ia64 and alpha +ExclusiveArch: %{ix86} %description xeuphoric is an X based ORIC emulator which has full support for sound, @@ -137,12 +137,16 @@ rm -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %postun touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files @@ -160,11 +164,14 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog -* Tue Aug 21 2007 Ian Chapman 0.18.2-8 +* Fri Sep 28 2007 Ian Chapman 0.18.2-9 +- Changed to exclusivearch %%{ix86}. (BZ #310391) + +* Tue Aug 21 2007 Ian Chapman 0.18.2-8 - Release bump for F8 mass rebuild - License change due to new guidelines -* Fri Jun 29 2007 Ian Chapman 0.18.2-7 +* Fri Jun 29 2007 Ian Chapman 0.18.2-7 - Various cleanups to the SPEC including conforming to new guidelines - Fix BZ #245091 - Additional .desktop files for other emulator models From 3796c13b43374f8019f6eb76f6f3a6cd72307bea Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 16:56:55 +0000 Subject: [PATCH 4/7] - Autorebuild for GCC 4.3 --- xeuphoric.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xeuphoric.spec b/xeuphoric.spec index b72a62e..548cece 100644 --- a/xeuphoric.spec +++ b/xeuphoric.spec @@ -1,6 +1,6 @@ Name: xeuphoric Version: 0.18.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An X based ORIC emulator Group: Applications/Emulators # The ROMs are believed to be public domain @@ -164,6 +164,9 @@ fi %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.18.2-10 +- Autorebuild for GCC 4.3 + * Fri Sep 28 2007 Ian Chapman 0.18.2-9 - Changed to exclusivearch %%{ix86}. (BZ #310391) From dc403868420354c87dd485ff1421729e110dc01c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:56 +0000 Subject: [PATCH 5/7] 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 4a7a57b07ce7cadc8be2acb6f2f6af1f886527fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:01 +0000 Subject: [PATCH 6/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 90a649deb96009171618d29f58fe4b071db350f8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Jul 2011 17:25:52 -0400 Subject: [PATCH 7/7] Retire xeuphoric. --- dead.package | 1 + sources | 1 - xeuphoric.png | Bin 244 -> 0 bytes xeuphoric.spec | 205 ------------------------------------------------- 4 files changed, 1 insertion(+), 206 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xeuphoric.png delete mode 100644 xeuphoric.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..440e457 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was fully retired on 2011-07-12 - it hasn't been shipped in a long time (if ever). Cleaning up some database/SCM discrepancies. diff --git a/sources b/sources deleted file mode 100644 index 585fdf7..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -4a2469ee45d6476350ffc0a92d165990 xeuphoric-0.18.2.tar.gz diff --git a/xeuphoric.png b/xeuphoric.png deleted file mode 100644 index 3cd4f32338aa4ff76def107c247bb44f292b264d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_G|0{Jle)u2D?E9G{pWXN)`oo+X_UAv!OxVnId;OX%_D6(6Bv`+Axm?!YzF^ 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 < - 0.18.2-10 -- Autorebuild for GCC 4.3 - -* Fri Sep 28 2007 Ian Chapman 0.18.2-9 -- Changed to exclusivearch %%{ix86}. (BZ #310391) - -* Tue Aug 21 2007 Ian Chapman 0.18.2-8 -- Release bump for F8 mass rebuild -- License change due to new guidelines - -* Fri Jun 29 2007 Ian Chapman 0.18.2-7 -- 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 - -* Sun Oct 15 2006 Paul F. Johnson - 0.18.2-5 -- corrected iconv - -* Sun Oct 15 2006 Paul F. Johnson - 0.18.2-4 -- fixed sysconfdir issue -- added desktop file and desktop icon -- added post and postun -- added CFLAGS to the make line - -* Sat Oct 14 2006 Paul F. Johnson - 0.18.2-3 -- created new ROM subpackage - -* Sat Aug 26 2006 Paul F. Johnson - 0.18.2-2 -- fixed sysconfdir problem - -* Mon Aug 10 2006 Paul F. Johnson - 0.18.2-1 -- Initial import into FE -- created datapath patch -- added own makeinstall as the provided one is broken