rpms/ski/devel ski-1.3.2-asm-page.patch, NONE, 1.1 ski-1.3.2-header.patch, NONE, 1.1 ski-1.3.2-ppc.patch, NONE, 1.1 ski.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	.cvsignore sources 
Added Files:
	ski-1.3.2-asm-page.patch ski-1.3.2-header.patch 
	ski-1.3.2-ppc.patch ski.spec 
Log Message:
- initial import

ski-1.3.2-asm-page.patch:

--- NEW FILE ski-1.3.2-asm-page.patch ---
# HG changeset patch
# User dan at eagle.danny.cz
# Date 1207382978 -7200
# Node ID 996a3cd264fc929d7048e43f0423ced44f1b05e4
# Parent  92536f1a84880e76ca9f46073cf125fc09eb437c
remove including <asm/page.h>

diff --git a/src/linux/syscall-linux.c b/src/linux/syscall-linux.c
--- a/src/linux/syscall-linux.c
+++ b/src/linux/syscall-linux.c
@@ -72,7 +72,6 @@
 #include <sys/uio.h>
 
 #include <linux/serial.h>
-#include <asm/page.h>
 #include <asm/unistd.h>
 
 #include "std.h"

ski-1.3.2-header.patch:

--- NEW FILE ski-1.3.2-header.patch ---
# HG changeset patch
# User dan at localhost.localdomain
# Date 1207816668 -7200
# Node ID c14a330b40aafef223c132939f96c94373e248ed
# Parent  92536f1a84880e76ca9f46073cf125fc09eb437c
- header cleanup

diff --git a/src/linux/syscall-linux.c b/src/linux/syscall-linux.c
--- a/src/linux/syscall-linux.c
+++ b/src/linux/syscall-linux.c
@@ -45,7 +45,6 @@
 #include <linux/posix_types.h>
 #include <linux/personality.h>
 #include <linux/sockios.h>
-#include <sys/io.h>
 
 #include <sys/file.h>
 #include <sys/fsuid.h>

ski-1.3.2-ppc.patch:

--- NEW FILE ski-1.3.2-ppc.patch ---
# HG changeset patch
# User dan at localhost.localdomain
# Date 1207816788 -7200
# Node ID b2122f4a4301195e1d18ce296410a358f2a8eb01
# Parent  c14a330b40aafef223c132939f96c94373e248ed
ppc cleanup

diff --git a/src/linux/syscall-linux.c b/src/linux/syscall-linux.c
--- a/src/linux/syscall-linux.c
+++ b/src/linux/syscall-linux.c
@@ -2251,8 +2251,10 @@ doSyscall (HWORD num, REG arg0, REG arg1
 	case TIOCSERSETMULTI:	/* Set multiport config */
 	case TIOCMIWAIT:	/* wait for a change on serial input line(s) */
 	case TIOCGICOUNT:	/* read serial port inline interrupt counts */
+#if !defined(__PPC__) && !defined(__PPC64__)
 	case TIOCGHAYESESP:	/* Get Hayes ESP configuration */
 	case TIOCSHAYESESP:	/* Set Hayes ESP configuration */
+#endif
 	case SIOCRTMSG:	/* call to routing system	*/
 	case SIOCSIFLINK:	/* set iface channel		*/
 	case SIOCGIFMEM:	/* get memory address (BSD)	*/


--- NEW FILE ski.spec ---
Name:           ski
Version:        1.3.2
Release:        4%{?dist}
Summary:        IA-64 user and system mode simulator

Group:          Applications/Emulators
License:        GPLv2+
URL:            http://ski.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1:         ski-1.3.2-asm-page.patch
Patch2:         ski-1.3.2-header.patch
Patch3:         ski-1.3.2-ppc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel ncurses-devel elfutils-libelf-devel libgnomeui-devel lesstif-devel
BuildRequires:  automake autoconf libtool gperf bison flex
Requires: %{name}-libs = %{version}-%{release}


%description
The Ski IA-64 user and system simulator originally developed by HP.


%package libs
Summary: Shared library for the ski simulator
Group: System Environment/Libraries

%description libs
Shared library for the ski simulator


%package devel
Summary: Development files for the ski simulator
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}

%description devel
The ski-devel package includes the static libraries and header files
for the support library for the Ski simulator.


%prep
%setup -q
%patch1 -p1 -b .asmpage
%patch2 -p1 -b .header
%patch3 -p1 -b .ppc


%build
./autogen.sh

%configure --with-x11 --with-gtk --enable-shared --disable-static

# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

# fix linking
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO ChangeLog
%doc doc/ski-notes.html doc/manual/*.pdf
%config(noreplace) %{_sysconfdir}/X11/app-defaults/*
%{_bindir}/ski
%{_bindir}/bski*
%{_bindir}/gski
%{_bindir}/xski
%{_bindir}/ski-fake-xterm
%{_mandir}/man1/*
%{_datadir}/%{name}

%files libs
%doc COPYING
%{_libdir}/libski-*.so.*

%files devel
%{_bindir}/ski-config
%{_includedir}/ski-1.3
%{_libdir}/libski.so


%changelog
* Thu Apr 10 2008 Dan Horak <dan[at]danny.cz> 1.3.2-4
- fix build on ppc

* Wed Apr  9 2008 Dan Horak <dan[at]danny.cz> 1.3.2-3
- fix linking issues
- use -libs for the subpackage

* Sat Apr  5 2008 Dan Horak <dan[at]danny.cz> 1.3.2-2
- fix compile in rawhide (kernel >= 2.6.25-rc5)

* Tue Feb 19 2008 Dan Horak <dan[at]danny.cz> 1.3.2-1
- update to version 1.3.2
- remove patches integrated into upstream codebase
- create a lib subpackage to be multi-lib aware

* Sat Nov 10 2007 Dan Horak <dan[at]danny.cz> 1.2.6-2
- merge libski and libskiui

* Sat Oct  6 2007 Dan Horak <dan[at]danny.cz> 1.2.6-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ski/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2008 21:44:55 -0000	1.1
+++ .cvsignore	13 Apr 2008 07:57:19 -0000	1.2
@@ -0,0 +1 @@
+ski-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ski/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2008 21:44:55 -0000	1.1
+++ sources	13 Apr 2008 07:57:19 -0000	1.2
@@ -0,0 +1 @@
+fa511f222d246e9a7578106db75fd6a5  ski-1.3.2.tar.gz