rpms/hawknl/devel hawknl-64bit.patch, NONE, 1.1 hawknl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/hawknl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13421/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hawknl-64bit.patch hawknl.spec 
Log Message:
auto-import hawknl-1.68-1.fc7 on branch devel from hawknl-1.68-1.fc7.src.rpm

hawknl-64bit.patch:

--- NEW FILE hawknl-64bit.patch ---
--- hawknl1.68/include/nl.h~	2007-03-13 15:44:17.000000000 +0100
+++ hawknl1.68/include/nl.h	2007-03-13 15:44:17.000000000 +0100
@@ -107,11 +107,6 @@
   #define NL_BIG_ENDIAN
 #endif
 
-/* How do we detect Solaris 64 and Linux 64 bit? */
-#if defined WIN64
-#define IS_64_BIT
-#endif
-
 /* 8 bit */
 typedef char NLbyte;
 typedef unsigned char NLubyte;
@@ -121,14 +116,9 @@
 typedef unsigned short NLushort;
 /* 32 bit */
 typedef float NLfloat;
-#ifdef IS_64_BIT
 typedef int NLlong;             /* Longs are 64 bit on a 64 bit CPU, but integers are still 32 bit. */
 typedef unsigned int NLulong;   /* This is, of course, not true on Windows (yet another exception), */
                                 /* but it does not hurt. */
-#else
-typedef long NLlong;
-typedef unsigned long NLulong;
-#endif
 /* 64 bit */
 typedef double NLdouble;
 /* multithread */
--- hawknl1.68/src/sock.c~	2007-03-13 16:25:34.000000000 +0100
+++ hawknl1.68/src/sock.c	2007-03-13 16:25:34.000000000 +0100
@@ -85,7 +85,7 @@
 
 /* define INADDR_NONE if not already */
 #ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned long) -1)
+#define INADDR_NONE ((unsigned int) -1)
 #endif
 
 /* SGI and MacOS X do not include socklen_t */
@@ -376,7 +376,7 @@
 static NLboolean sock_SetNonBlocking(SOCKET socket)
 {
     int rc;
-    unsigned long i = 1;
+    unsigned int i = 1;
     
     rc = ioctl(socket, FIONBIO, &i);
     if(rc == SOCKET_ERROR)
@@ -1760,13 +1760,13 @@
     port = ntohs(((struct sockaddr_in *)address)->sin_port);
     if(port == 0)
     {
-        _stprintf(string, TEXT("%lu.%lu.%lu.%lu"), (addr >> 24) & 0xff, (addr >> 16)
+        _stprintf(string, TEXT("%u.%u.%u.%u"), (addr >> 24) & 0xff, (addr >> 16)
             & 0xff, (addr >> 8) & 0xff, addr & 0xff);
     }
     else
     {
-        _stprintf(string, TEXT("%lu.%lu.%lu.%lu:%u"), (addr >> 24) & 0xff, (addr >> 16)
-            & 0xff, (addr >> 8) & 0xff, addr & 0xff, port);
+        _stprintf(string, TEXT("%u.%u.%u.%u:%u"), (addr >> 24) & 0xff, (addr >> 16)
+            & 0xff, (addr >> 8) & 0xff, addr & 0xff, (unsigned int)port);
     }
     return string;
 }
@@ -1777,7 +1777,7 @@
     NLulong     ipaddress, port = 0;
     int         ret;
 
-    ret = _stscanf((const NLchar *)string, (const NLchar *)TEXT("%lu.%lu.%lu.%lu:%lu"), &a1, &a2, &a3, &a4, &port);
+    ret = _stscanf((const NLchar *)string, (const NLchar *)TEXT("%u.%u.%u.%u:%u"), &a1, &a2, &a3, &a4, &port);
 
     if(a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255 || port > 65535 || ret < 4)
     {
@@ -1930,7 +1930,7 @@
     }
     else
     {
-        if(((struct sockaddr_in *)address)->sin_addr.s_addr == (unsigned long)INADDR_NONE)
+        if(((struct sockaddr_in *)address)->sin_addr.s_addr == (unsigned int)INADDR_NONE)
         {
             _tcsncpy(tempname, (const NLchar *)TEXT("Bad address"), (size_t)(NL_MAX_STRING_LENGTH));
         }
@@ -1998,7 +1998,7 @@
     {
         nlSetError(NL_NO_ERROR);
     }
-    if(((struct sockaddr_in *)address)->sin_addr.s_addr != (unsigned long)INADDR_NONE)
+    if(((struct sockaddr_in *)address)->sin_addr.s_addr != (unsigned int)INADDR_NONE)
     {
         /* we are already done! */
         address->valid = NL_TRUE;


--- NEW FILE hawknl.spec ---
Name:           hawknl
Version:        1.68
Release:        1%{?dist}
Summary:        Game oriented network library
Group:          System Environment/Libraries
License:        LGPL
URL:            http://www.hawksoft.com/hawknl/
Source0:        http://www.sonic.net/~philf/download/HawkNL168src.tar.gz
Patch0:         hawknl-64bit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
HawkNL is a free, open source, game oriented network API released under the 
GNU LGPL. HawkNL (NL) is a fairly low level API, a wrapper over Berkeley/Unix
Sockets and Winsock. But NL also provides other features.


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

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{name}%{version}
%patch0 -p1 -z .64bit
# some fixups
sed -i 's|ln -s $(LIBDIR)/$(OUTPUT)|ln -s $(OUTPUT)|g' src/makefile.linux
sed -i 's|-soname,NL.so|-soname,libNL.so|' src/makefile.linux
sed -i 's|\r||g' src/readme.txt src/nlchanges.txt


%build
make %{?_smp_mflags} -f makefile.linux \
  OPTFLAGS="$RPM_OPT_FLAGS -D_XOPEN_SOURCE=500"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
make -f makefile.linux install LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
  INCDIR=$RPM_BUILD_ROOT%{_includedir}/%{name}
# some cleanup
rm $RPM_BUILD_ROOT%{_libdir}/libNL.a $RPM_BUILD_ROOT%{_libdir}/NL.so \
  $RPM_BUILD_ROOT%{_libdir}/libNL.so.1


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc src/readme.txt src/nlchanges.txt
%{_libdir}/libNL.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/libNL.so


%changelog
* Mon Mar 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.68-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hawknl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2007 08:10:37 -0000	1.1
+++ .cvsignore	15 Mar 2007 11:30:14 -0000	1.2
@@ -0,0 +1 @@
+HawkNL168src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hawknl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2007 08:10:37 -0000	1.1
+++ sources	15 Mar 2007 11:30:14 -0000	1.2
@@ -0,0 +1 @@
+2e4971d422b8c5cadfe2a85527ff2fcf  HawkNL168src.tar.gz