Author: musuruan Update of /cvs/free/rpms/arcem/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10624 Modified Files: .cvsignore arcem.sh arcem.spec sources Added Files: arcem-1.50-Makefile.patch Removed Files: arcem-cvs_20070611-improvemakefile.patch arcem-cvs_20070611-manual.patch arcem-cvs_20070611-soundfix.patch arcem-cvs_20070611-uichanges.patch Log Message: * Wed Jan 02 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.50-1 - Updated to 1.50 - Specfile update and cleanup - Dropped archs no longer supported by Fedora/RPM Fusion - Used MacOS X icns instead of the Windows ico arcem-1.50-Makefile.patch: Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) --- NEW FILE arcem-1.50-Makefile.patch --- diff -durN arcem-src.orig/Makefile arcem-src/Makefile --- arcem-src.orig/Makefile 2012-12-13 00:41:33.000000000 +0100 +++ arcem-src/Makefile 2013-01-02 16:06:59.259726183 +0100 @@ -56,24 +56,24 @@ -Wcast-qual -Wwrite-strings -Wno-unused ifeq ($(PROFILE),yes) -CFLAGS = -O -g -pg -ftest-coverage -fprofile-arcs +CFLAGS ?= -O -g -pg -ftest-coverage -fprofile-arcs LIBS += -lgcov else ifeq ($(DEBUG),yes) CFLAGS += -O0 -g else -CFLAGS = -O3 -funroll-loops -fexpensive-optimizations -ffast-math \ +CFLAGS ?= -O3 -funroll-loops -fexpensive-optimizations -ffast-math \ -fomit-frame-pointer -frerun-cse-after-loop endif endif CFLAGS += \ - $(CFL) $(WARN) \ + $(WARN) \ -I$(SYSTEM) -Iarch -I. prefix=/usr/local -INSTALL_DIR = $(prefix)/bin +INSTALL_DIR = INSTALL=cp @@ -174,11 +174,11 @@ endif ifeq (${SYSTEM},X) -CFLAGS += -DSYSTEM_X -I/usr/X11R6/include +CFLAGS += -DSYSTEM_X -I/usr/include/X11 ifneq ($(shell uname),Darwin) CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -LIBS += -L/usr/X11R6/lib -lXext -lX11 +LIBS += -lXext -lX11 OBJS += X/true.o X/pseudo.o #SOUND_SUPPORT = yes endif @@ -228,8 +228,9 @@ all: $(TARGET) install: all - $(INSTALL) $(TARGET) $(INSTALL_DIR) - f=arcemrc; test -f $$HOME/.$$f || $(INSTALL) $$f $(HOME)/.$$f + mkdir -p $(INSTALL_DIR)/$(prefix)/bin + $(INSTALL) $(TARGET) $(INSTALL_DIR)/$(prefix)/bin + #f=arcemrc; test -f $$HOME/.$$f || $(INSTALL) $$f $(HOME)/.$$f $(TARGET): $(OBJS) $(MODEL).o $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(MODEL).o -o $@ I file binari arcem-src.orig/.Makefile.swp e arcem-src/.Makefile.swp sono diversi Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/arcem/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2008 18:35:05 -0000 1.2 +++ .cvsignore 6 Jan 2013 18:14:43 -0000 1.3 @@ -1,2 +1,3 @@ -arcem-cvs_20070611.tar.bz2 +arcem-1.50-src.zip linuxrom.zip +arcem-1.50.html Index: arcem.sh =================================================================== RCS file: /cvs/free/rpms/arcem/devel/arcem.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- arcem.sh 19 Jul 2008 18:35:05 -0000 1.1 +++ arcem.sh 6 Jan 2013 18:14:43 -0000 1.2 @@ -6,6 +6,7 @@ # parameters received. arcembin='/usr/bin/arcem.bin'; +arcemrc='/usr/share/arcem/arcemrc' moddir='/usr/share/arcem/modules'; kdialog='/usr/bin/kdialog'; zenity='/usr/bin/zenity'; @@ -40,6 +41,12 @@ exit 2 fi +# Check if ~/.arcemrc exists and is a file. If not, make it. +if [ ! -f "$HOME/.arcemrc" ] ; then + # Setup RC file + install -pm0644 "$arcemrc" "$HOME/.arcemrc" +fi + # Check if ~/.arcem exists and is a directory. If not, make it and setup up # the subsequent default environment. If .arcem already exists then no changes # will be made. Notify the user of the default environment and the need for a @@ -54,7 +61,7 @@ if [ -x $kdialog ] ; then $kdialog --title "First Run" --msgbox "$msg" elif [ -x $zenity ] ; then - $zenity --title "First Run" --info --text "$msg" + $zenity --title="First Run" --info --text="$msg" else echo -e $msg | fold -s --width=50 | $xmessage -center -file - fi @@ -69,7 +76,7 @@ # Launch arcem with the linux ROM if no user ROM if [ -f "$HOME/.arcem/ROM" ] ; then - exec $arcembin --hostfsdir $HOME --memory 16M + exec padsp $arcembin --hostfsdir $HOME --memory 16M else - exec $arcembin --hostfsdir $HOME --memory 16M --rom /usr/share/arcem/linuxrom/ROM + exec padsp $arcembin --hostfsdir $HOME --memory 16M --rom /usr/share/arcem/linuxrom/ROM fi Index: arcem.spec =================================================================== RCS file: /cvs/free/rpms/arcem/devel/arcem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- arcem.spec 8 Feb 2012 21:45:16 -0000 1.4 +++ arcem.spec 6 Jan 2013 18:14:43 -0000 1.5 @@ -1,30 +1,26 @@ -# The source is retrieved from cvs: -# cvs -z3 -d:pserver:anonymous@arcem.cvs.sourceforge.net:/cvsroot/arcem co -P arcem -# The arcem directory should be compressed as the following: -# arcem-cvs_YYYYMMDD.tar.bz2 - -%define cvsdate 20070611 - Name: arcem -Version: 1.10 -Release: 6.cvs_%{cvsdate}%{?dist} +Version: 1.50 +Release: 1%{?dist} Summary: Highly portable Acorn Archimedes emulator -Group: Applications/Emulators + License: GPLv2+ URL: http://arcem.sourceforge.net -Source0: %{name}-cvs_%{cvsdate}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.zip +# ARMLinux Rom Image - kernel v2.2 Source1: http://arcem.sourceforge.net/linuxrom.zip +# Wrapper script Source2: arcem.sh +# RPM Fusion README Source3: README_arcem.dribble -Patch0: arcem-cvs_20070611-improvemakefile.patch -Patch1: arcem-cvs_20070611-uichanges.patch -Patch2: arcem-cvs_20070611-manual.patch -Patch3: arcem-cvs_20070611-soundfix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# User manual +Source4: http://arcem.sourceforge.net/manual/%{name}-%{version}.html +# Makefile patch +Patch0: arcem-1.50-Makefile.patch + BuildRequires: desktop-file-utils -BuildRequires: ImageMagick BuildRequires: libX11-devel BuildRequires: libXext-devel +BuildRequires: libicns-utils Requires: hicolor-icon-theme Requires: xorg-x11-apps @@ -36,25 +32,26 @@ %prep -%setup -qn %{name} +%setup -qn %{name}-src # Makefile is heavily patched because it's largely broken in many ways %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 unzip -qq %{SOURCE1} +# Place the user manual +install -pm0644 %{SOURCE4} manual.html -%build -# Sound support seems stable but experimental, but largely doesn't work on PPC -%ifarch %{ix86} x86_64 - make %{?_smp_mflags} RPMFLAGS="%{optflags}" SOUND_SUPPORT=yes -%else - make %{?_smp_mflags} RPMFLAGS="%{optflags}" HOST_BIGENDIAN=yes -%endif +# Place RPM Fusion README +install -pm0644 %{SOURCE3} . + +# Fix premissions +chmod 644 docs/* +find . -type f -name "*.h" -exec chmod 644 {} \; +find . -type f -name "*.c" -exec chmod 644 {} \; -#Build icon image -convert win/arc.ico %{name}.png + +%build +export CFLAGS="%{optflags}" +make %{?_smp_mflags} SOUND_SUPPORT=yes # Build desktop icon cat >%{name}.desktop <<EOF @@ -74,48 +71,72 @@ %install rm -rf %{buildroot} -make install INSTALL_DIR=%{buildroot} -mkdir -p %{buildroot}%{_datadir}/%{name}/{modules,linuxrom} -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -install -pm0644 support_modules/*/*,ffa %{buildroot}%{_datadir}/%{name}/modules +make install INSTALL_DIR=%{buildroot} prefix=%{_prefix} + +# Install default configuration file +mkdir -p %{buildroot}%{_datadir}/%{name} +install -pm0644 arcemrc %{buildroot}%{_datadir}/%{name} + +# Install ARMLinux Rom Image +mkdir -p %{buildroot}%{_datadir}/%{name}/linuxrom install -pm0644 ROM.linux %{buildroot}%{_datadir}/%{name}/linuxrom/ROM + +# Install modules +mkdir -p %{buildroot}%{_datadir}/%{name}/modules +install -pm0644 support_modules/*/*,ffa %{buildroot}%{_datadir}/%{name}/modules + +# Install wrapper script +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.bin install -pm0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name} -install -pm0644 %{name}-0.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -pm0644 %{SOURCE3} . + +# Extract Mac OS X icons +icns2png -x macosx/%{name}.icns + +# Install icons +for i in 128; do + install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps + install -m 644 %{name}_${i}x${i}x32.png \ + %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png +done + +# Install desktop files desktop-file-install --vendor dribble \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop -%clean -rm -rf %{buildroot} - - %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,-) %{_bindir}/%{name} %{_bindir}/%{name}.bin %{_datadir}/%{name} %{_datadir}/applications/dribble-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%doc docs/5thColumn.txt docs/COPYING index.html manual.html README_arcem.dribble +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%doc docs/5thColumn.txt docs/COPYING manual.html README_arcem.dribble %changelog +* Wed Jan 02 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.50-1 +- Updated to 1.50 +- Specfile update and cleanup +- Dropped archs no longer supported by Fedora/RPM Fusion +- Used MacOS X icns instead of the Windows ico + * Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.10-6.cvs_20070611 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -136,4 +157,4 @@ - Updated license field due to new guidelines * Mon Jun 11 2007 Ian Chapman <packages(a)amiga-hardware.com&gt; 1.10-0.cvs_20070611 -- Initial Release \ No newline at end of file +- Initial Release Index: sources =================================================================== RCS file: /cvs/free/rpms/arcem/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jul 2008 18:35:05 -0000 1.2 +++ sources 6 Jan 2013 18:14:43 -0000 1.3 @@ -1,2 +1,3 @@ -6f0ad6c1f9fd80887e26192736e085b6 arcem-cvs_20070611.tar.bz2 +f00d778b50358f3f73eac30adcee0ec4 arcem-1.50-src.zip a8b171aee91fda454a625b3dcfda7bdc linuxrom.zip +f93cc1ee52fc8bbc60a332010c5c883d arcem-1.50.html --- arcem-cvs_20070611-improvemakefile.patch DELETED --- --- arcem-cvs_20070611-manual.patch DELETED --- --- arcem-cvs_20070611-soundfix.patch DELETED --- --- arcem-cvs_20070611-uichanges.patch DELETED ---