- up to 0.5.2

Changed files:
    iodine-make.patch -> 1.3
    iodine-opt.patch -> 1.3
    iodine.spec -> 1.7

diff --git a/iodine-make.patch b/iodine-make.patch
index 3130c722f1a69d8fe972e28b54566959ea6922b3..c3714ce515c05ad1d993b5ed6685d16bf6f81b27 100644 (file)
--- a/iodine-make.patch
+++ b/iodine-make.patch
@@ -1,31 +1,37 @@
---- iodine-0.4.2/Makefile      2008-11-21 13:44:41.755943542 +0200
-+++ iodine-0.4.2/Makefile      2008-11-21 13:45:21.234222315 +0200
+diff -Nur iodine-0.5.2.orig/Makefile iodine-0.5.2/Makefile
+--- iodine-0.5.2.orig/Makefile 2009-03-21 14:07:49.000000000 +0100
++++ iodine-0.5.2/Makefile      2010-01-27 01:56:16.000000000 +0100
 @@ -1,4 +1,4 @@
 -prefix=/usr/local
 +prefix=/usr
  sbindir=$(prefix)/sbin
  datadir=$(prefix)/share
  mandir=$(datadir)/man
-@@ -15,7 +15,7 @@
+@@ -14,10 +14,10 @@
+ RM=rm
  RM_FLAGS=-f
  
+-TARGETOS = `uname`
++TARGETOS = Linux
+ 
  all: 
--      @(cd src; $(MAKE) all)
-+      $(MAKE) -C src all
+-      @(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
++      $(MAKE) -C src TARGETOS=$(TARGETOS) all
  
- install: all
-       $(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
-@@ -36,10 +36,10 @@
+ cross-mingw: 
+       @(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all)
+@@ -52,11 +52,11 @@
+ test: all
        @echo "!! The check library is required for compiling and running the tests"
        @echo "!! Get it at http://check.sf.net"
--      @(cd tests; $(MAKE) all)
-+      $(MAKE) -C tests all
+-      @(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
++      $(MAKE) -C tests TARGETOS=$(TARGETOS) all
  
  clean:
        @echo "Cleaning..."
 -      @(cd src; $(MAKE) clean)
 -      @(cd tests; $(MAKE) clean)
-+      @$(MAKE) -C src clean
-+      @$(MAKE) -C tests clean
-       @rm -rf bin
++      $(MAKE) -C src clean
++      $(MAKE) -C tests clean
+       @rm -rf bin iodine-latest-win32*
  

diff --git a/iodine-opt.patch b/iodine-opt.patch
index dc996b76ec8acb38c5b1e128a0a2d469b2eeaca5..7b3f0709eb363b71e531731164c682510d14f943 100644 (file)
--- a/iodine-opt.patch
+++ b/iodine-opt.patch
@@ -1,12 +1,13 @@
---- iodine-0.4.2/src/Makefile~ 2008-11-21 13:42:44.000000000 +0200
-+++ iodine-0.4.2/src/Makefile  2008-11-21 13:43:11.606739911 +0200
-@@ -8,8 +8,9 @@
- OS = `uname | tr "a-z" "A-Z"`
+diff -Nur iodine-0.5.2.orig/src/Makefile iodine-0.5.2/src/Makefile
+--- iodine-0.5.2.orig/src/Makefile     2009-03-21 14:07:49.000000000 +0100
++++ iodine-0.5.2/src/Makefile  2010-01-27 01:29:26.000000000 +0100
+@@ -9,8 +9,9 @@
  ARCH = `uname -m`
  
+ LIBPATH = -L.
 +OPTFLAGS = -g -Wall
- LDFLAGS =  -lz `sh osflags link`
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
+ LDFLAGS =  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
 +CFLAGS = -c $(OPTFLAGS) -D$(OS) -pedantic
  
  all: stateos $(CLIENT) $(SERVER)

diff --git a/iodine.spec b/iodine.spec
index 9573e30c5fc2a3730a95b6a3262151e49efc41fc..3cf8518861d96c198df10610ee90b406e81891bb 100644 (file)
--- a/iodine.spec
+++ b/iodine.spec
@@ -1,12 +1,12 @@
 Summary:       IP over DNS is now easy
 Summary(pl.UTF-8):     Łatwa w użyciu implementacja IP over DNS
 Name:          iodine
-Version:       0.4.2
+Version:       0.5.2
 Release:       1
 License:       GPL
 Group:         Networking
 Source0:       http://code.kryo.se/iodine/%{name}-%{version}.tar.gz
-# Source0-md5: 890f13ab9ee7ea722baf0ceb3ee561c0
+# Source0-md5: 6952343cc4614857f83dbb81247871e7
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-make.patch
 URL:           http://code.kryo.se/iodine/
@@ -28,7 +28,7 @@ ograniczony firewallem, ale dozwolone są zapytania DNS.
 %patch1 -p1
 
 %build
-%{__make} -C src \
+%{__make} \
        CC="%{__cc}" \
        OPTFLAGS="%{rpmcflags}"